Include Symbols and Zapf Dingbats fonts. Part of base 14 fonts

https://www.xpdfreader.com/download.html

Author: ViliusSutkus89

dependency-builder/build.gradle

@@ -72,6 +72,7 @@ task gatherLicenses {
                         // LGPL2.1 and GPLv2 licenses include form feed (page break) characters.
                         // XML does not take kindly to form feed characters.
                         if ((depName == "cairo" && licenseFilename == "COPYING-LGPL-2.1") ||
+                            (depName == "Fonts-SymbolAndZapfDingbats" && licenseFilename == "COPYING") ||
                             (depName == "freetype" && licenseFilename == "docs/GPLv2.TXT") ||
                             (depName == "glib-2.0" && licenseFilename == "COPYING") ||
                             (depName == "fribidi" && licenseFilename == "COPYING") ||
@@ -90,6 +91,7 @@ task gatherLicenses {
             addLicense("pdf2htmlEX", ["LICENSE", "LICENSE_GPLv3"])
             addLicense("cairo", ["COPYING", "COPYING-LGPL-2.1", "COPYING-MPL-1.1"])
             addLicense("fontconfig", ["COPYING"])
+            addLicense("Fonts-SymbolAndZapfDingbats", ["COPYING"])
             addLicense("freetype", ["docs/LICENSE.TXT", "docs/GPLv2.TXT", "docs/FTL.TXT"])
             addLicense("fribidi", ["COPYING"])
             addLicense("glib-2.0", ["COPYING"])
@@ -138,6 +140,15 @@ task collectReleaseAssetsFromShareFolder {
             duplicatesStrategy('exclude')
         }
     }
+    // @TODO: maybe make EPTarball extract to "installed" ?
+    doLast {
+        copy {
+            def abi = project.hasProperty('abi') ? project.property('abi') : 'armeabi-v7a'
+            from("$projectDir/.cxx/cmake/release/" + abi + "/Fonts-SymbolAndZapfDingbats-prefix/src/Fonts-SymbolAndZapfDingbats/")
+            include("*.pfb")
+            into("$buildDir/assets/fonts")
+        }
+    }
 }
 
 task collectDebugAssetsFromShareFolder {
@@ -162,6 +173,15 @@ task collectDebugAssetsFromShareFolder {
             duplicatesStrategy('exclude')
         }
     }
+    // @TODO: maybe make EPTarball extract to "installed" ?
+    doLast {
+        copy {
+            def abi = project.hasProperty('abi') ? project.property('abi') : 'armeabi-v7a'
+            from("$projectDir/.cxx/cmake/debug/" + abi + "/Fonts-SymbolAndZapfDingbats-prefix/src/Fonts-SymbolAndZapfDingbats/")
+            include("*.pfb")
+            into("$buildDir/assets/fonts")
+        }
+    }
 }
 
 tasks.whenTaskAdded {

dependency-builder/src/main/cpp/CMakeLists.txt

@@ -49,6 +49,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/EPHelpers.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/EPAutotools.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/EPCMake.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/EPMeson.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/EPTarball.cmake)
 
 SET(TARBALL_STORAGE ${CMAKE_CURRENT_SOURCE_DIR}/tarballs/ CACHE PATH "Path to manually downloaded tarballs. Used to look up before downloading from the internet.")
 

dependency-builder/src/main/cpp/EPTarball.cmake

@@ -0,0 +1,50 @@
+# EPTarball.cmake
+#
+# pdf2htmlEX-Android (https://github.com/ViliusSutkus89/pdf2htmlEX-Android)
+# Android port of pdf2htmlEX - Convert PDF to HTML without losing text or format.
+#
+# Copyright (c) 2019 Vilius Sutkus <ViliusSutkus89@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+function(ExternalProjectTarball EXTERNAL_PROJECT_NAME)
+  set(options)
+  set(oneValueArgs URL URL_HASH)
+  set(multipleValueArgs DEPENDS)
+  cmake_parse_arguments(EP "${options}" "${oneValueArgs}" "${multipleValueArgs}" ${ARGN})
+
+  FilterDependsList(EP_DEPENDS)
+  CheckIfPackageAlreadyBuilt(${EXTERNAL_PROJECT_NAME})
+  if ("${${EXTERNAL_PROJECT_NAME}_FOUND}")
+    return()
+  endif()
+
+  CheckIfTarballCachedLocally(${EXTERNAL_PROJECT_NAME} EP_URL)
+
+  ExternalProject_Add(${EXTERNAL_PROJECT_NAME}
+    ${EP_DEPENDS}
+
+    URL ${EP_URL}
+    URL_HASH ${EP_URL_HASH}
+
+    BUILD_IN_SOURCE 1
+
+    CONFIGURE_COMMAND /bin/true
+    BUILD_COMMAND /bin/true
+    INSTALL_COMMAND /bin/true
+
+    LOG_DOWNLOAD 1
+    LOG_INSTALL 1
+  )
+endfunction(ExternalProjectTarball)
+

dependency-builder/src/main/cpp/packages/Fonts-SymbolAndZapfDingbats.cmake

@@ -0,0 +1,7 @@
+# https://www.xpdfreader.com/download.html
+
+ExternalProjectTarball(Fonts-SymbolAndZapfDingbats
+  URL https://xpdfreader-dl.s3.amazonaws.com/xpdf-t1fonts.tar.gz
+  URL_HASH SHA256=513853afed2a4ada0217bd93d95ab7f1663b6a0f37a07136e22404c6c6eaf342
+)
+

dependency-builder/src/main/cpp/packages/pdf2htmlEX.cmake

@@ -1,7 +1,7 @@
 include_guard(GLOBAL)
 
 ExternalProjectCMake(pdf2htmlEX
-  DEPENDS cairo freetype libfontforge poppler
+  DEPENDS cairo Fonts-SymbolAndZapfDingbats freetype libfontforge poppler
 
   URL https://github.com/pdf2htmlEX/pdf2htmlEX/archive/v0.18.7-poppler-0.81.0.tar.gz
   URL_HASH SHA256=510d9fc2175fda1ab6968c389fa78d7078183583a543019f4eefe09b8373c6e4

pdf2htmlEX/src/androidTest/java/com/viliussutkus89/android/pdf2htmlex/FontconfigInstrumentedTests.java

@@ -94,5 +94,25 @@ public synchronized void matchTimesTest() {
                 .contains(getFontFilenameFromFontconfig("Times:Bold:Italic")));
     }
 
+    @Test
+    public synchronized void matchSymbolTest() {
+        // @TODO: init only FontconfigAndroid, not the whole pdf2htmlEX
+        new pdf2htmlEX(InstrumentationRegistry.getInstrumentation().getTargetContext());
+
+        assertEquals("s050000l.pfb", getFontFilenameFromFontconfig("Symbol"));
+        assertEquals("s050000l.pfb", getFontFilenameFromFontconfig("StandardSymbolsL"));
+        assertEquals("s050000l.pfb", getFontFilenameFromFontconfig("Standard Symbols L"));
+    }
+
+    @Test
+    public synchronized void matchDingbatsTest() {
+        // @TODO: init only FontconfigAndroid, not the whole pdf2htmlEX
+        new pdf2htmlEX(InstrumentationRegistry.getInstrumentation().getTargetContext());
+
+        assertEquals("d050000l.pfb", getFontFilenameFromFontconfig("Dingbats"));
+        assertEquals("d050000l.pfb", getFontFilenameFromFontconfig("ZapfDingbats"));
+        assertEquals("d050000l.pfb", getFontFilenameFromFontconfig("Zapf Dingbats"));
+    }
+
     private native String getFontFilenameFromFontconfig(String pattern);
 }

pdf2htmlEX/src/main/assets/etc/fonts/local.conf

@@ -7,4 +7,19 @@
 
   <description>Load Android font files from /system/fonts</description>
   <dir>/system/fonts</dir>
+
+  <include ignore_missing="yes">system-etc-fonts-xml-translated.conf</include>
+
+  <dir prefix="relative">../../fonts</dir>
+
+  <alias binding="strong">
+    <family>Symbol</family>
+    <prefer><family>Standard Symbols L</family></prefer>
+  </alias>
+
+  <alias binding="strong">
+    <family>Zapf Dingbats</family>
+    <prefer><family>Dingbats</family></prefer>
+  </alias>
+
 </fontconfig>