Author: maxberger
Date: Fri Dec 7 07:36:53 2007
New Revision: 602125
URL: http://svn.apache.org/viewvc?rev=602125&view=rev
Log:
Updated xmlgraphics from SVN
Added autodetection of fonts in jar files (x-font and x-font-truetype)
Added files needed for testcase
Please note: Actual testcase is still missing!
Added:
xmlgraphics/fop/trunk/test/resources/META-INF/
xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF
xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.LICENSE
xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.ttf
(with props)
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.3svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/
PrintRendererConfigurator.java
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.3svn.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.3svn.jar?rev=602125&r1=602124&r2=602125&view=diff
=
=
=
=
=
=
=
=
======================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/
PrintRendererConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=602125&r1=602124&r2=602125&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/
PrintRendererConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/
PrintRendererConfigurator.java Fri Dec 7 07:36:53 2007
@@ -50,6 +50,7 @@
import org.apache.fop.fonts.autodetect.FontFileFinder;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
import org.apache.fop.util.LogUtil;
+import org.apache.xmlgraphics.util.ClasspathResource;
/**
* Base Print renderer configurator (mostly handles font
configuration)
@@ -159,6 +160,16 @@
} catch (IOException e) {
LogUtil.handleException(log, e, strict);
}
+
+ // load fonts from classpath
+
addFontInfoListFromFileList(ClasspathResource.getInstance()
+ .listResourcesOfMimeType("application/x-
font"),
+ fontInfoList, fontResolver, fontCache);
+ addFontInfoListFromFileList(
+ ClasspathResource.getInstance()
+ .listResourcesOfMimeType(
+ "application/x-font-
truetype"),
+ fontInfoList, fontResolver, fontCache);
}
// directory (multiple font) configuration
Added: xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF?rev=602125&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF (added)
+++ xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF Fri
Dec 7 07:36:53 2007
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+
+Name: fonts/DejaVuLGCSerif.ttf
+Content-Type: application/x-font
+
Added: xmlgraphics/fop/trunk/test/resources/fonts/
DejaVuLGCSerif.LICENSE
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.LICENSE?rev=602125&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- xmlgraphics/fop/trunk/test/resources/fonts/
DejaVuLGCSerif.LICENSE (added)
+++ xmlgraphics/fop/trunk/test/resources/fonts/
DejaVuLGCSerif.LICENSE Fri Dec 7 07:36:53 2007
@@ -0,0 +1,98 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public
domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see
below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person
obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and
distribute the
+Font Software, including without limitation the rights to use,
copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and
to permit
+persons to whom the Font Software is furnished to do so, subject to
the
+following conditions:
+
+The above copyright and trademark notices and this permission
notice shall
+be included in all copies of one or more of the Font Software
typefaces.
+
+The Font Software may be modified, altered, or added to, and in
particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if
the fonts
+are renamed to names not containing either the words "Bitstream" or
the word
+"Vera".
+
+This License becomes null and void to the extent applicable to
Fonts or Font
+Software that has been modified and is distributed under the
"Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package
but no
+copy of one or more of the Font Software typefaces may be sold by
itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT,
PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
Software
+without prior written authorization from the Gnome Foundation or
Bitstream
+Inc., respectively. For further information, contact: fonts at
gnome dot
+org.
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package
but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall
not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+$Id: LICENSE 778 2006-04-20 18:14:24Z moyogo $
Added: xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.ttf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.ttf?rev=602125&view=auto
=
=
=
=
=
=
=
=
======================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/trunk/test/resources/fonts/
DejaVuLGCSerif.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
