Makefile.fetch | 3 +-
download.lst | 9 ++++++-
external/more_fonts/ExternalPackage_noto_kufi_arabic.mk | 7 ------
external/more_fonts/ExternalPackage_noto_naskh_arabic.mk | 17 +++++++++++++++
external/more_fonts/Module_more_fonts.mk | 6 +++--
external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk | 4 +--
external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk | 14 ++++++++++++
vcl/qa/cppunit/complextext.cxx | 14 ++++++------
8 files changed, 54 insertions(+), 20 deletions(-)
New commits:
commit 2902ab24ecc5ffbf4907ea83b2028508b9de6364
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 16:11:27 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 22:00:56 2023 +0200
tdf#124591: Rename *noto.mk to *noto_kufi_arabic.mk
Since it is the only one left in this package. Still using the old
tarball, though, since there does not exist any releases upstream (yet):
https://github.com/notofonts/arabic
Change-Id: I9a21fda5519bbf184af9b2e70b8cf65e3046a724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157283
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 1a91c7f785c9..41d6a85d13c0 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -179,7 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_KUFI_ARABIC_TARBALL)
\
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL)
\
diff --git a/download.lst b/download.lst
index e06dbad101f6..20b9e5d754aa 100644
--- a/download.lst
+++ b/download.lst
@@ -157,8 +157,8 @@ FONT_LINLIBERTINEG_TARBALL :=
e7a384790b13c29113e22e596ade9687-LinLibertineG-201
# three static lines
# so that git cherry-pick
# will not run into conflicts
-FONT_NOTO_SHA256SUM :=
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
-FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
+FONT_NOTO_KUFI_ARABIC_SHA256SUM :=
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
+FONT_NOTO_KUFI_ARABIC_TARBALL := noto-fonts-20171024.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
similarity index 96%
rename from external/more_fonts/ExternalPackage_noto.mk
rename to external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
index c9b25163b888..ed6b9fea3f85 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_kufi_arabic))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoKufiArabic-Bold.ttf \
diff --git a/external/more_fonts/Module_more_fonts.mk
b/external/more_fonts/Module_more_fonts.mk
index f37a5c34fbc0..e17af9a15141 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
ExternalPackage_libre_hebrew \
- ExternalPackage_noto \
+ ExternalPackage_noto_kufi_arabic \
ExternalPackage_noto_naskh_arabic \
ExternalPackage_noto_sans \
ExternalPackage_noto_sans_arabic \
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
UnpackedTarball_libre_hebrew \
- UnpackedTarball_noto \
+ UnpackedTarball_noto_kufi_arabic \
UnpackedTarball_noto_naskh_arabic \
UnpackedTarball_noto_sans \
UnpackedTarball_noto_sans_arabic \
diff --git a/external/more_fonts/UnpackedTarball_noto.mk
b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
similarity index 66%
rename from external/more_fonts/UnpackedTarball_noto.mk
rename to external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
index ee6f223f8cad..482727dd6246 100644
--- a/external/more_fonts/UnpackedTarball_noto.mk
+++ b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto_kufi_arabic))
-$(eval $(call gb_UnpackedTarball_set_tarball,font_noto,$(FONT_NOTO_TARBALL)))
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_kufi_arabic,$(FONT_NOTO_KUFI_ARABIC_TARBALL)))
# vim: set noet sw=4 ts=4:
commit 739ee655294be56021dc6244dde3faa75e288bd5
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 16:02:04 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 22:00:50 2023 +0200
tdf#124591: Remove Noto Mono
It no longer exists upstream, probably renamed to Noto Sans Mono, so if
it is going to be a new font we are better off dropping it entirely.
Change-Id: I8d727c2419a6081b37802324ff115611bce3c9dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157282
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto.mk
index 5e528da13842..c9b25163b888 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -12,7 +12,6 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoKufiArabic-Bold.ttf \
NotoKufiArabic-Regular.ttf \
- NotoMono-Regular.ttf \
))
# vim: set noet sw=4 ts=4:
commit 4d6533a5babd23262f27eb65fd4b5b12a5d889c0
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 11:53:35 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 22:00:44 2023 +0200
tdf#124591: Update Noto Naskh Arabic to v2.016
from:
https://github.com/notofonts/arabic/releases/tag/NotoNaskhArabic-v2.016
Change-Id: Ic5d23046afddb8d7230ed3f71363cb178f572124
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157271
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index c8ea14b3a6bc..1a91c7f785c9 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -183,6 +183,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL)
\
+ $(call
fetch_Optional,MORE_FONTS,FONT_NOTO_NASKH_ARABIC_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_HEBREW_TARBALL)
\
$(call
fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_HEBREW_TARBALL) \
$(call
fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \
diff --git a/download.lst b/download.lst
index b470064253a0..e06dbad101f6 100644
--- a/download.lst
+++ b/download.lst
@@ -182,6 +182,11 @@ FONT_NOTO_SANS_ARABIC_TARBALL := NotoSansArabic-v2.010.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_NASKH_ARABIC_SHA256SUM :=
2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac
+FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.016.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_NOTO_SANS_HEBREW_SHA256SUM :=
ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a
FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip
# three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto.mk
index d5bfe4cf8b88..5e528da13842 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -13,10 +13,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoKufiArabic-Bold.ttf \
NotoKufiArabic-Regular.ttf \
NotoMono-Regular.ttf \
- NotoNaskhArabic-Bold.ttf \
- NotoNaskhArabic-Regular.ttf \
- NotoNaskhArabicUI-Bold.ttf \
- NotoNaskhArabicUI-Regular.ttf \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
b/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
new file mode 100644
index 000000000000..0e701739330b
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_naskh_arabic))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoNaskhArabic/full/ttf/NotoNaskhArabic-Bold.ttf \
+ NotoNaskhArabic/full/ttf/NotoNaskhArabic-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk
b/external/more_fonts/Module_more_fonts.mk
index 12bcabcc604d..f37a5c34fbc0 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_libertineg \
ExternalPackage_libre_hebrew \
ExternalPackage_noto \
+ ExternalPackage_noto_naskh_arabic \
ExternalPackage_noto_sans \
ExternalPackage_noto_sans_arabic \
ExternalPackage_noto_sans_armenian \
@@ -48,6 +49,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_libertineg \
UnpackedTarball_libre_hebrew \
UnpackedTarball_noto \
+ UnpackedTarball_noto_naskh_arabic \
UnpackedTarball_noto_sans \
UnpackedTarball_noto_sans_arabic \
UnpackedTarball_noto_sans_armenian \
diff --git a/external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk
b/external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk
new file mode 100644
index 000000000000..f429d85f13be
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto_naskh_arabic))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_naskh_arabic,$(FONT_NOTO_NASKH_ARABIC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index a0ab0c4c00bc..44a40baf0a2f 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -326,15 +326,15 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret)
// A. RTL text
// Set font size to its UPEM to decrease rounding issues
- aFont = vcl::Font("Noto Naskh Arabic", "Regular", Size(0, 2048));
+ aFont = vcl::Font("Noto Sans Arabic", "Regular", Size(0, 1000));
pOutDev->SetFont(aFont);
aText = u"لا بلا";
// 1) Regular DX array, the ligature width is given to the first components
// and the next ones are all zero width.
- nRefTextWidth = 3325;
- aRefCharWidths= { 1060, 1060, 1512, 2076, 3325, 3325 };
+ nRefTextWidth = 1710;
+ aRefCharWidths= { 582, 582, 842, 1111, 1710, 1710 };
nTextWidth = pOutDev->GetTextArray(aText, &aCharWidths, 0, -1,
/*bCaret*/false);
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths.get_subunit_array());
CPPUNIT_ASSERT_EQUAL(nRefTextWidth, nTextWidth);
@@ -342,7 +342,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret)
// 2) Caret placement DX array, ligature width is distributed over its
// components.
- aRefCharWidths = { 530, 1060, 1512, 2076, 2701, 3325 };
+ aRefCharWidths = { 291, 582, 842, 1111, 1410, 1710 };
nTextWidth = pOutDev->GetTextArray(aText, &aCharWidths, 0, -1,
/*bCaret*/true);
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths.get_subunit_array());
CPPUNIT_ASSERT_EQUAL(nRefTextWidth, nTextWidth);
@@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret)
// 3) caret placement with combining marks, they should not add to ligature
// component count.
aText = u"لَاَ بلَاَ";
- aRefCharWidths = { 530, 530, 1060, 1060, 1512, 2076, 2701, 2701, 3325,
3325 };
+ aRefCharWidths = { 291, 291, 582, 582, 842, 1111, 1410, 1410, 1710, 1710 };
nTextWidth2 = pOutDev->GetTextArray(aText, &aCharWidths, 0, -1,
/*bCaret*/true);
CPPUNIT_ASSERT_EQUAL(aCharWidths[0], aCharWidths[1]);
CPPUNIT_ASSERT_EQUAL(aCharWidths[2], aCharWidths[3]);
@@ -401,8 +401,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf152048)
pOutDev->SetFont(aFont);
// get an compare the default text array
- std::vector<sal_Int32> aRefCharWidths{ 933, 2340, 2340, 3687, 4646, 5493 };
- tools::Long nRefTextWidth(5493);
+ std::vector<sal_Int32> aRefCharWidths{ 934, 2341, 2341, 3689, 4647, 5495 };
+ tools::Long nRefTextWidth(5495);
KernArray aCharWidths;
tools::Long nTextWidth = pOutDev->GetTextArray(aText, &aCharWidths);
