download.lst | 8 ++++---- external/more_fonts/ExternalPackage_reem.mk | 1 + vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt |binary vcl/qa/cppunit/pdfexport/pdfexport.cxx | 18 +++++++++--------- 4 files changed, 14 insertions(+), 13 deletions(-)
New commits: commit c010c1375bfec3aaa7d154c7164ae31df556cb68 Author: Khaled Hosny <kha...@aliftype.com> AuthorDate: Sun Jul 31 23:42:41 2022 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Tue Aug 2 12:13:14 2022 +0200 more_fonts: Update Amiri Update PDF export test that depends on a mapping the font no longer has, and use different characters that meet the test criteria. Change-Id: I0f89297a52ffcef3513e0a788ec3bab645cc354b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137661 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> diff --git a/download.lst b/download.lst index 48db7812cc00..96db5d48e9f7 100644 --- a/download.lst +++ b/download.lst @@ -82,8 +82,8 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz -export FONT_AMIRI_SHA256SUM := 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 -export FONT_AMIRI_TARBALL := Amiri-0.111.zip +export FONT_AMIRI_SHA256SUM := 9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7 +export FONT_AMIRI_TARBALL := Amiri-0.117.zip export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz export FONT_REEM_SHA256SUM := c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413 diff --git a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt index 7fecc55c6386..e5cc9bc0b3cc 100644 Binary files a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt and b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt differ diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index b335d395eb49..03aed3112d64 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1330,13 +1330,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_1) aZCodec.Decompress(pStream->GetMemory(), aObjectStream); CPPUNIT_ASSERT(aZCodec.EndCompression()); aObjectStream.Seek(0); - // The <01> is glyph id, <0020> is code point. - // The document has three characters <space><nbspace><space>, but the font - // reuses the same glyph for space and nbspace so we should have a single - // CMAP entry for the space, and nbspace will be handled with ActualText - // (tested above). + // The <01> is glyph id, <2044> is code point. + // The document has two characters <2044><2215><2044>, but the font + // reuses the same glyph for U+2044 and U+2215 so we should have a single + // CMAP entry for the U+2044, and U+2215 will be handled with ActualText + // (tested below). std::string aCmap("1 beginbfchar\n" - "<01> <0020>\n" + "<01> <2044>\n" "endbfchar"); std::string aData(static_cast<const char*>(aObjectStream.GetData()), aObjectStream.GetSize()); @@ -1377,7 +1377,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_1) CPPUNIT_ASSERT_EQUAL_MESSAGE("The should be one ActualText entry!", static_cast<size_t>(1), nCount); - aActualText = "/Span<</ActualText<FEFF00A0>>>"; + aActualText = "/Span<</ActualText<FEFF2215>>>"; nPos = aData.find(aActualText); CPPUNIT_ASSERT_MESSAGE("ActualText not found!", nPos != std::string::npos); } commit 44aa6bb9b7d2abeb10731cb0e1b7b52c1a79b7a3 Author: Khaled Hosny <kha...@aliftype.com> AuthorDate: Sun Jul 31 23:50:18 2022 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Tue Aug 2 12:13:06 2022 +0200 more_fonts: Update Reem Kufi Also update test expectation due to changed glyph order. Change-Id: I8f6d1a057077cb6de5e5d7fce4bec29929edb8b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137663 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> diff --git a/download.lst b/download.lst index 418226979157..48db7812cc00 100644 --- a/download.lst +++ b/download.lst @@ -86,8 +86,8 @@ export FONT_AMIRI_SHA256SUM := 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817 export FONT_AMIRI_TARBALL := Amiri-0.111.zip export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz -export FONT_REEM_SHA256SUM := f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f -export FONT_REEM_TARBALL := ReemKufi-0.7.zip +export FONT_REEM_SHA256SUM := c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413 +export FONT_REEM_TARBALL := ReemKufi-1.2.zip export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac diff --git a/external/more_fonts/ExternalPackage_reem.mk b/external/more_fonts/ExternalPackage_reem.mk index 9a40652b55cc..bc26cecc7dfe 100644 --- a/external/more_fonts/ExternalPackage_reem.mk +++ b/external/more_fonts/ExternalPackage_reem.mk @@ -11,6 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_reem,font_reem)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_reem,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ttf/ReemKufi-Regular.ttf \ + ttf/ReemKufi-Bold.ttf \ )) # vim: set noet sw=4 ts=4: diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index d77cc4a4b00d..b335d395eb49 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1434,8 +1434,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_2) "<05> <0647>\n" "<06> <062F>\n" "<08> <062C>\n" - "<09> <0628>\n" - "<0B> <0623>\n" + "<0A> <0628>\n" + "<0C> <0623>\n" "endbfchar"); std::string aData(static_cast<const char*>(aObjectStream.GetData()), aObjectStream.GetSize());