diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2022-07-31 23:42:41 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-08-03 13:49:59 +0200 |
| commit | b2acb3d8256eda53f08574868050bda4f4318daf (patch) | |
| tree | 8016ed7373caf423a86f52981d8cc4f8c694430b | |
| parent | 5397ff649deadc301d9c3f1187814c91f8e7f77b (diff) | |
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.tietze@documentfoundation.org>
(cherry picked from commit 660c14d12592fdc1bd566398d272e0e8b1affe89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137611
Reviewed-by: خالد حسني <khaled@aliftype.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit ab355fde048052ace3a37e9b499ef321e0835546)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137715
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt | bin | 8154 -> 9286 bytes | |||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/download.lst b/download.lst index 316bdf1a695b..3b2abd992c44 100644 --- a/download.lst +++ b/download.lst @@ -86,8 +86,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 := f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f diff --git a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt Binary files differindex 7fecc55c6386..e5cc9bc0b3cc 100644 --- a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt +++ b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index a399986626b0..8ceac70b1ce5 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1225,13 +1225,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()); @@ -1272,7 +1272,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); } |