Author: kwright
Date: Fri Dec 15 02:45:09 2017
New Revision: 1818225
URL: http://svn.apache.org/viewvc?rev=1818225&view=rev
Log:
Change font download so it works again
Modified:
manifoldcf/trunk/site/build.xml
manifoldcf/trunk/site/pdf/config.xml
Modified: manifoldcf/trunk/site/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/build.xml?rev=1818225&r1=1818224&r2=1818225&view=diff
==============================================================================
--- manifoldcf/trunk/site/build.xml (original)
+++ manifoldcf/trunk/site/build.xml Fri Dec 15 02:45:09 2017
@@ -37,11 +37,11 @@
</target>
<target name="calculate-dejavu-condition">
- <available file="fonts/dejavu-fonts-ttf-2.33.zip"
property="dejavuAvailable"/>
+ <available file="fonts/dejavu-fonts-ttf-2.37.zip"
property="dejavuAvailable"/>
</target>
<target name="dejavu-check"
depends="download-dejavu-fonts,calculate-dejavu-condition"
unless="dejavuAvailable">
- <echo message="Dejavu fonts cannot be built without
dejavu-fonts-ttf-2.33.zip"/>
+ <echo message="Dejavu fonts cannot be built without
dejavu-fonts-ttf-2.37.zip"/>
</target>
<target name="calculate-ipa-condition">
@@ -101,7 +101,7 @@
<target name="build-dejavu-fonts" depends="dejavu-check"
if="dejavuAvailable">
<mkdir dir="tmp/font/dejavu-fonts"/>
- <unzip src="fonts/dejavu-fonts-ttf-2.33.zip"
dest="tmp/font/dejavu-fonts"/>
+ <unzip src="fonts/dejavu-fonts-ttf-2.37.zip"
dest="tmp/font/dejavu-fonts"/>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
<classpath>
<fileset dir="../lib">
@@ -112,7 +112,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf"/>
<arg value="tmp/font/DejaVuSans.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -125,7 +125,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans-Oblique.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans-Oblique.ttf"/>
<arg value="tmp/font/DejaVuSans-Oblique.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -138,7 +138,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans-Bold.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans-Bold.ttf"/>
<arg value="tmp/font/DejaVuSans-Bold.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -151,7 +151,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif.ttf"/>
<arg value="tmp/font/DejaVuSerif.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -164,7 +164,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif-Italic.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif-Italic.ttf"/>
<arg value="tmp/font/DejaVuSerif-Italic.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -177,7 +177,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif-Bold.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif-Bold.ttf"/>
<arg value="tmp/font/DejaVuSerif-Bold.xml"/>
</java>
<java classname="org.apache.fop.fonts.apps.TTFReader" fork="true">
@@ -190,7 +190,7 @@
<include name="commons-logging*.jar"/>
</fileset>
</classpath>
- <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSansMono.ttf"/>
+ <arg
value="tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono.ttf"/>
<arg value="tmp/font/DejaVuSansMono.xml"/>
</java>
@@ -258,12 +258,12 @@
</target>
<target name="calculate-dejavu-condition-before">
- <available file="fonts/dejavu-fonts-ttf-2.33.zip"
property="dejavuAvailableBefore"/>
+ <available file="fonts/dejavu-fonts-ttf-2.37.zip"
property="dejavuAvailableBefore"/>
</target>
<target name="download-dejavu-fonts"
depends="calculate-dejavu-condition-before" unless="dejavuAvailableBefore">
<mkdir dir="fonts"/>
- <get
src="http://superb-dca2.dl.sourceforge.net/project/dejavu/dejavu/2.33/dejavu-fonts-ttf-2.33.zip"
dest="fonts"/>
+ <get
src="http://versaweb.dl.sourceforge.net/project/dejavu/dejavu/2.37/dejavu-fonts-ttf-2.37.zip"
dest="fonts"/>
</target>
<target name="calculate-ipa-condition-before">
Modified: manifoldcf/trunk/site/pdf/config.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/pdf/config.xml?rev=1818225&r1=1818224&r2=1818225&view=diff
==============================================================================
--- manifoldcf/trunk/site/pdf/config.xml (original)
+++ manifoldcf/trunk/site/pdf/config.xml Fri Dec 15 02:45:09 2017
@@ -21,7 +21,7 @@
<fonts>
<!-- DejaVuSans -->
- <font metrics-file="{root}/tmp/font/DejaVuSans.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSans.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf">
<font-triplet name="DejaVuSans" style="normal" weight="normal"/>
<font-triplet name="DejaVuSans" style="normal" weight="100"/>
<font-triplet name="DejaVuSans" style="normal" weight="200"/>
@@ -35,7 +35,7 @@
</font>
<!-- DejaVuSans-Oblique -->
- <font metrics-file="{root}/tmp/font/DejaVuSans-Oblique.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans-Oblique.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSans-Oblique.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans-Oblique.ttf">
<font-triplet name="DejaVuSans" style="italic" weight="normal"/>
<font-triplet name="DejaVuSans" style="italic" weight="100"/>
<font-triplet name="DejaVuSans" style="italic" weight="200"/>
@@ -49,7 +49,7 @@
</font>
<!-- DejaVuSans-Bold -->
- <font metrics-file="{root}/tmp/font/DejaVuSans-Bold.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSans-Bold.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSans-Bold.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans-Bold.ttf">
<font-triplet name="DejaVuSans" style="bold" weight="normal"/>
<font-triplet name="DejaVuSans" style="bold" weight="100"/>
<font-triplet name="DejaVuSans" style="bold" weight="200"/>
@@ -63,7 +63,7 @@
</font>
<!-- DejaVuSerif -->
- <font metrics-file="{root}/tmp/font/DejaVuSerif.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSerif.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif.ttf">
<font-triplet name="DejaVuSerif" style="normal" weight="normal"/>
<font-triplet name="DejaVuSerif" style="normal" weight="100"/>
<font-triplet name="DejaVuSerif" style="normal" weight="200"/>
@@ -77,7 +77,7 @@
</font>
<!-- DejaVuSerif-Italic -->
- <font metrics-file="{root}/tmp/font/DejaVuSerif-Italic.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif-Italic.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSerif-Italic.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif-Italic.ttf">
<font-triplet name="DejaVuSerif" style="italic" weight="normal"/>
<font-triplet name="DejaVuSerif" style="italic" weight="100"/>
<font-triplet name="DejaVuSerif" style="italic" weight="200"/>
@@ -91,7 +91,7 @@
</font>
<!-- DejaVuSerif-Bold -->
- <font metrics-file="{root}/tmp/font/DejaVuSerif-Bold.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSerif-Bold.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSerif-Bold.xml"
kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerif-Bold.ttf">
<font-triplet name="DejaVuSerif" style="bold" weight="normal"/>
<font-triplet name="DejaVuSerif" style="bold" weight="100"/>
<font-triplet name="DejaVuSerif" style="bold" weight="200"/>
@@ -105,7 +105,7 @@
</font>
<!-- DejaVuSansMono -->
- <font metrics-file="{root}/tmp/font/DejaVuSansMono.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.33/ttf/DejaVuSansMono.ttf">
+ <font metrics-file="{root}/tmp/font/DejaVuSansMono.xml" kerning="yes"
embed-url="file:///{root}/tmp/font/dejavu-fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono.ttf">
<font-triplet name="DejaVuSansMono" style="normal" weight="normal"/>
<font-triplet name="DejaVuSansMono" style="normal" weight="100"/>
<font-triplet name="DejaVuSansMono" style="normal" weight="200"/>