aheritier 2004/09/22 13:37:18
Modified: pdf/src/plugin-resources userconfig.xml
pdf/xdocs changes.xml
Removed: pdf/src/plugin-resources/fonts myriad.xml myriadb.xml
myriadbi.xml myriadi.xml WMB_____.PFB WMBI____.PFB
WMI_____.PFB WMR_____.PFB
Log:
reverse MPPDF-15 - licence problem with the font
Revision Changes Path
1.5 +20 -38 maven-plugins/pdf/src/plugin-resources/userconfig.xml
Index: userconfig.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/src/plugin-resources/userconfig.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- userconfig.xml 21 Sep 2004 21:10:34 -0000 1.4
+++ userconfig.xml 22 Sep 2004 20:37:18 -0000 1.5
@@ -24,72 +24,54 @@
Usage: java org.apache.fop.apps.Fop -c userconfig.xml -fo fo-file -pdf pdf-file
-->
<configuration>
- <!-- NOT IMPLEMENTED
+ <!-- NOT IMPLEMENTED
basedir: normally the base directory is the directory where the fo file is
located. if you want to specify your own, uncomment this entry
-->
- <!--
+ <!--
<entry>
<key>baseDir</key>
<value></value>
</entry>
-->
- <!--
+ <!--
************************************************************************
HYPHENATION
************************************************************************
-->
- <!--
+ <!--
hyphenation directory
if you want to specify your own directory with hyphenation pattern
then uncomment the next entry and add the directory name
-->
- <!--
+ <!--
<entry>
<key>hyphenation-dir</key>
<value>/java/xml-fop/hyph</value>
</entry>
-->
- <!--
+ <!--
************************************************************************
Add fonts here
************************************************************************
-->
- <fonts>
- <font metrics-file="fonts/ttf-gara.xml" kerning="yes"
embed-file="fonts/gara.ttf">
- <font-triplet name="Garamond" style="normal" weight="normal"/>
- </font>
- <font metrics-file="fonts/ttf-garabd.xml" kerning="yes"
embed-file="fonts/garabd.ttf">
- <font-triplet name="Garamond" style="normal" weight="bold"/>
- </font>
- <font metrics-file="fonts/ttf-garait.xml" kerning="yes"
embed-file="fonts/garait.ttf">
- <font-triplet name="Garamond" style="italic" weight="normal"/>
- </font>
-
- <!-- TT fonts -->
- <font metrics-file="fonts/myriad.xml" kerning="yes"
embed-file="fonts/WMR_____.PFB">
- <font-triplet name="Myriad" style="normal" weight="normal"/>
- </font>
-
- <font metrics-file="fonts/myriadi.xml" kerning="yes"
embed-file="fonts/WMI_____.PFB">
- <font-triplet name="Myriad" style="italic" weight="normal"/>
- </font>
-
- <font metrics-file="fonts/myriadb.xml" kerning="yes"
embed-file="fonts/WMB_____.PFB">
- <font-triplet name="Myriad" style="normal" weight="bold"/>
- </font>
-
- <font metrics-file="fonts/myriadbi.xml" kerning="yes"
embed-file="fonts/WMBI____.PFB">
- <font-triplet name="Myriad" style="italic" weight="bold"/>
- </font>
-
-
- <!-- example -->
- <!--
+ <fonts>
+ <font metrics-file="fonts/ttf-gara.xml" kerning="yes"
embed-file="fonts/gara.ttf">
+ <font-triplet name="Garamond" style="normal" weight="normal"/>
+ </font>
+ <font metrics-file="fonts/ttf-garabd.xml" kerning="yes"
embed-file="fonts/garabd.ttf">
+ <font-triplet name="Garamond" style="normal" weight="bold"/>
+ </font>
+ <font metrics-file="fonts/ttf-garait.xml" kerning="yes"
embed-file="fonts/garait.ttf">
+ <font-triplet name="Garamond" style="italic" weight="normal"/>
+ </font>
+ <!-- TT fonts -->
+ <!-- example -->
+ <!--
<font metrics-file="arial.xml" kerning="yes" embed-file="arial.ttf">
<font-triplet name="Arial" style="normal" weight="normal"/>
<font-triplet name="ArialMT" style="normal" weight="normal"/>
</font>
-->
- </fonts>
+ </fonts>
</configuration>
1.19 +0 -1 maven-plugins/pdf/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/xdocs/changes.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- changes.xml 21 Sep 2004 22:15:53 -0000 1.18
+++ changes.xml 22 Sep 2004 20:37:18 -0000 1.19
@@ -24,7 +24,6 @@
<body>
<release version="2.2-SNAPSHOT" date="In CVS">
<action dev="aheritier" type="fix" issue="MPPDF-14">PRE tag support
added.</action>
- <action dev="aheritier" type="add" issue="MPPDF-15" due-to="Håvard
Bjåstad">New font for use in PDF documents: Myriad.</action>
<action dev="carlos" type="fix">Show "v." in cover only when version is not
empty.</action>
<action dev="aheritier" type="add" issue="MPPDF-10" due-to="M. Sean
Gilligan">Add USLetter (8.5"x11") as a paper type.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
