update SMuFL fonts and refactor build, closes #281

build.properties

@@ -12,7 +12,6 @@ lib_components.dir=node_modules
 lessc.cmd=node_modules/less/bin/lessc
 yarn.cmd=yarn
 bash.command=/bin/bash
-smufl.font=http://www.smufl.org/files/bravura-1.18.zip
 wega.fonts.dir=/opt/wega-non-free/fonts
 wega.img.dir=/opt/wega-non-free/img
 

build.xml

@@ -45,19 +45,6 @@
         </parallel>
     </target>
 
-    <target name="check-for-smufl-font" depends="yarn">
-        <condition property="update.smufl-font">
-            <not>
-                <available file="${lib_components.dir}/bravura.zip"/>
-            </not>
-        </condition>
-    </target>
-
-    <target name="download-smufl-font" depends="check-for-smufl-font" if="${update.smufl-font}">
-        <description>Download Bravura font from the official website</description>
-        <get src="${smufl.font}" dest="${lib_components.dir}/bravura.zip" skipexisting="no"/>
-    </target>
-
     <target name="yarn" depends="init">
         <description>Update javascript libraries via yarn</description>
         <exec executable="${yarn.cmd}" failonerror="yes">
@@ -75,7 +62,7 @@
         </exec>
     </target>
 
-    <target name="dist" depends="init, download-smufl-font, yarn, less">
+    <target name="dist" depends="init, yarn, less">
         <copy file="expath-pkg.xml.tmpl" tofile="${dist.dir}/expath-pkg.xml" filtering="true" overwrite="true">
             <filterset>
                 <filter token="project.version" value="${project.version}"/>
@@ -107,25 +94,18 @@
             </fileset>
         </copy>
 
-        <!-- extract smufl fonts -->
-        <unzip src="${lib_components.dir}/bravura.zip" dest="${tmp.dir}"/>
-
         <!-- Copy additional fonts -->
         <copy todir="${dist.dir}/resources/fonts" failonerror="false">
-            <fileset dir="${tmp.dir}/eot/">
+            <fileset dir="${lib_components.dir}/bravura/redist/eot/">
                 <include name="Bravura.*"/>
-                <!--<include name="BravuraText.eot"/>-->
-                <!--<include name="BravuraText.woff"/>-->
-                <!--<include name="BravuraText.otf"/>-->
-                <!--<include name="BravuraText.svg"/>-->
             </fileset>
-            <fileset dir="${tmp.dir}/woff/">
+            <fileset dir="${lib_components.dir}/bravura/redist/woff/">
                 <include name="Bravura.*"/>
             </fileset>
-            <fileset dir="${tmp.dir}/otf/">
+            <fileset dir="${lib_components.dir}/bravura/redist/otf/">
                 <include name="Bravura.*"/>
             </fileset>
-            <fileset dir="${tmp.dir}/svg/">
+            <fileset dir="${lib_components.dir}/bravura/redist/svg/">
                 <include name="Bravura.*"/>
             </fileset>
             <fileset dir="${wega.fonts.dir}">

package.json

@@ -14,6 +14,7 @@
     "bootstrap-hover-dropdown": "^2.2.1",
     "bootstrap-remote-data": "peterstadler/bootstrap-remote-data#master",
     "bootstrap-toggle": "^2.0.0",
+    "bravura": "https://github.com/steinbergmedia/bravura",
     "csLink": "correspSearch/csLink",
     "fittextjs": "^1.2.0",
     "flip": "nnattawat/flip",

yarn.lock

@@ -170,6 +170,10 @@ bootstrap@^4.1.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.2.1.tgz#8f8bdca024dbf0e8644da32e918c8a03a90a5757"
   integrity sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q==
 
+"bravura@https://github.com/steinbergmedia/bravura":
+  version "0.0.0"
+  resolved "https://github.com/steinbergmedia/bravura#e5d667e00d92962510fb487241cad003b61d3855"
+
 cardinal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"