incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1237495 - in /incubator/lcf/trunk: lib/fop.jar lib/xmlgraphics-commons-1.4.jar lib/xmlgraphics-commons-1.5svn.jar site/ site/build.xml site/pdf/config.xml
Date Sun, 29 Jan 2012 22:17:16 GMT
Author: kwright
Date: Sun Jan 29 22:17:15 2012
New Revision: 1237495

URL: http://svn.apache.org/viewvc?rev=1237495&view=rev
Log:
Part of CONNECTORS-387.  Now we can build Japanese PDFs.  Still need some structural changes
and conditional font selection.

Added:
    incubator/lcf/trunk/lib/xmlgraphics-commons-1.5svn.jar   (with props)
Removed:
    incubator/lcf/trunk/lib/xmlgraphics-commons-1.4.jar
Modified:
    incubator/lcf/trunk/lib/fop.jar
    incubator/lcf/trunk/site/   (props changed)
    incubator/lcf/trunk/site/build.xml
    incubator/lcf/trunk/site/pdf/config.xml

Modified: incubator/lcf/trunk/lib/fop.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/fop.jar?rev=1237495&r1=1237494&r2=1237495&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/lcf/trunk/lib/xmlgraphics-commons-1.5svn.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib/xmlgraphics-commons-1.5svn.jar?rev=1237495&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/lib/xmlgraphics-commons-1.5svn.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: incubator/lcf/trunk/site/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 29 22:17:15 2012
@@ -1 +1,3 @@
 build
+fonts
+tmp

Modified: incubator/lcf/trunk/site/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/build.xml?rev=1237495&r1=1237494&r2=1237495&view=diff
==============================================================================
--- incubator/lcf/trunk/site/build.xml (original)
+++ incubator/lcf/trunk/site/build.xml Sun Jan 29 22:17:15 2012
@@ -59,11 +59,19 @@
         </copy>
         <!-- Replace the fop jar with a more up-to-date version -->
         <delete file="tmp/forrest/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-0.95.jar"/>
+        <delete file="tmp/forrest/build/plugins/lib/fop-0.95.jar"/>
         <copy todir="tmp/forrest/plugins/org.apache.forrest.plugin.output.pdf/lib">
             <fileset dir="../lib">
                 <include name="fop*.jar"/>
             </fileset>
         </copy>
+        <!-- Same with the XML Graphics jar -->
+        <delete file="tmp/forrest/lib/core/xmlgraphics-commons-1.3.1.jar"/>
+        <copy todir="tmp/forrest/lib/core">
+            <fileset dir="../lib">
+                <include name="xmlgraphics-commons*.jar"/>
+            </fileset>
+        </copy>
         <!-- Replace the file tmp/forrest/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
with our own patched version -->
         <delete file="tmp/forrest/plugins/org.apache.forrest.plugin.output.pdf/output.xmap"/>
         <copy todir="tmp/forrest/plugins/org.apache.forrest.plugin.output.pdf">
@@ -99,6 +107,7 @@
             <classpath>
                 <fileset dir="../lib">
                     <include name="fop*.jar"/>
+                    <include name="xmlgraphics-commons*.jar"/>
                     <include name="avalon*.jar"/>
                     <include name="commons-io*.jar"/>
                     <include name="commons-logging*.jar"/>

Modified: incubator/lcf/trunk/site/pdf/config.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/pdf/config.xml?rev=1237495&r1=1237494&r2=1237495&view=diff
==============================================================================
--- incubator/lcf/trunk/site/pdf/config.xml (original)
+++ incubator/lcf/trunk/site/pdf/config.xml Sun Jan 29 22:17:15 2012
@@ -21,7 +21,7 @@
       <fonts>
         
         <!-- IPAGothic -->
-        <!-- font metrics-file="{root}/tmp/font/ipagothic.xml" kerning="yes" sub-font="IPAGothic"
embed-url="file:///{root}/tmp/font/ipa-fonts/IPAGTTC00303/ipag.ttc">
+        <font metrics-file="{root}/tmp/font/ipagothic.xml" kerning="yes" sub-font="IPAGothic"
embed-url="file:///{root}/tmp/font/ipa-fonts/IPAGTTC00303/ipag.ttc">
           <font-triplet name="IPAGothic" style="normal" weight="normal"/>
           <font-triplet name="IPAGothic" style="normal" weight="bold"/>
           <font-triplet name="IPAGothic" style="normal" weight="100"/>
@@ -44,10 +44,10 @@
           <font-triplet name="IPAGothic" style="italic" weight="700"/>
           <font-triplet name="IPAGothic" style="italic" weight="800"/>
           <font-triplet name="IPAGothic" style="italic" weight="900"/>
-        </font -->
+        </font>
 
         <!-- IPAPGothic -->
-        <!-- font metrics-file="{root}/tmp/font/ipapgothic.xml" kerning="yes" sub-font="IPAPGothic"
embed-url="file:///{root}/tmp/font/ipa-fonts/IPAGTTC00303/ipag.ttc">
+        <font metrics-file="{root}/tmp/font/ipapgothic.xml" kerning="yes" sub-font="IPAPGothic"
embed-url="file:///{root}/tmp/font/ipa-fonts/IPAGTTC00303/ipag.ttc">
           <font-triplet name="IPAPGothic" style="normal" weight="normal"/>
           <font-triplet name="IPAPGothic" style="normal" weight="bold"/>
           <font-triplet name="IPAPGothic" style="normal" weight="100"/>
@@ -70,7 +70,7 @@
           <font-triplet name="IPAPGothic" style="italic" weight="700"/>
           <font-triplet name="IPAPGothic" style="italic" weight="800"/>
           <font-triplet name="IPAPGothic" style="italic" weight="900"/>
-        </font -->
+        </font>
       </fonts>
     </renderer>
   </renderers>



Mime
View raw message