You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by je...@apache.org on 2011/01/14 10:43:06 UTC
svn commit: r1058916 - in /xmlgraphics/batik/branches/svgcolor12: ./
contrib/rasterizertask/ documentation-sources/ documentation-sources/conf/
documentation-sources/content/ documentation-sources/content/demo/
documentation-sources/content/xdocs/ docu...
Author: jeremias
Date: Fri Jan 14 09:43:04 2011
New Revision: 1058916
URL: http://svn.apache.org/viewvc?rev=1058916&view=rev
Log:
Merge from Trunk (revisions 963199-1058911)
Modified:
xmlgraphics/batik/branches/svgcolor12/ (props changed)
xmlgraphics/batik/branches/svgcolor12/CHANGES
xmlgraphics/batik/branches/svgcolor12/README
xmlgraphics/batik/branches/svgcolor12/contrib/rasterizertask/README
xmlgraphics/batik/branches/svgcolor12/documentation-sources/conf/cli.xconf (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/demo/AppletDemo.java (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/download.cgi (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/branches.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/index.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/svg12.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/download.html (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/faq.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/install.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/site.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/status.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tabs.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/font-converter.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/index.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/rasterizer.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/css.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/extending.xml
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/index.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/parsers.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/resources/schema/catalog.xcat (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/sitemap.xmap (props changed)
xmlgraphics/batik/branches/svgcolor12/documentation-sources/skinconf.xml (props changed)
xmlgraphics/batik/branches/svgcolor12/lib/build/svn-info-revision.xsl (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/anim/resources/Messages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/DropDownHistoryModelMessages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/NameEditorDialogMessages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/NodePickerPanelMessages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/util/gui/resources/ScrollablePopupMenuMessages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/primaryDoc.svg (props changed)
xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocDynamic11.svg (props changed)
xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocDynamic12.svg (props changed)
xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocStatic11.svg (props changed)
xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocStatic12.svg (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/make-squiggle-app.sh.template (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/AbstractUndoableCommand.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/ElementOverlayController.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/HistoryBrowserInterface.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/NodePickerController.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/NodeTemplates.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/UndoableCommand.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/ext/awt/image/codec/imageio/ (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/svggen/font/SVGFont.java
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/ParsedURLData.java
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/SVGFeatureStrings.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/DropDownComponent.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLContext.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLDocument.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLEditorKit.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLScanner.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLToken.java (props changed)
xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLView.java (props changed)
xmlgraphics/batik/branches/svgcolor12/test-resources/org/apache/batik/transcoder/wmf/resources/Messages.properties (props changed)
xmlgraphics/batik/branches/svgcolor12/test-sources/org/apache/batik/dom/ElementTraversalTest.java (props changed)
Propchange: xmlgraphics/batik/branches/svgcolor12/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 14 09:43:04 2011
@@ -2,3 +2,4 @@ classes
build.properties
test-reports
batik-[0-9].[0-9]*
+site
Propchange: xmlgraphics/batik/branches/svgcolor12/
------------------------------------------------------------------------------
svn:mergeinfo = /xmlgraphics/batik/trunk:963199-1058911
Modified: xmlgraphics/batik/branches/svgcolor12/CHANGES
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/CHANGES?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/CHANGES (original)
+++ xmlgraphics/batik/branches/svgcolor12/CHANGES Fri Jan 14 09:43:04 2011
@@ -9,9 +9,10 @@ Bug fixing is an on-going task, so it is
1. Bugzilla problem reports fixed:
- 43411, 43847, 44553, 44590, 44919, 44936, 44966, 45112, 45114,
- 45117, 45397, 45520, 45883, 45958, 46072, 46124, 46430, 46431,
- 46855, 46871, 47201, 47202, 48411
+ 43411, 43847, 43950, 44553, 44590, 44919, 44936, 44966, 45112,
+ 45114, 45117, 45397, 45520, 45883, 45958, 46072, 46124, 46202,
+ 46430, 46431, 46855, 46871, 47201, 47202, 48182, 48411, 49889,
+ 50006
2. New features
@@ -32,6 +33,10 @@ Bug fixing is an on-going task, so it is
* Improve Batik's Rhino class shutter so that it works with Rhino 1.6R7.
* Allow SVGGenerator2D to embed fonts that weren't obtained from the
standard AWT font lookup mechanism.
+ * ttf2svg no longer outputs hkern elements outside user-provided glyph range.
+ * Batik now tries to access content in HTTP error responses (for example, one
+ is able to setup custom content for missing - HTTP code 404 - and/or other
+ erroneous situations).
4. Bug fixes
@@ -56,6 +61,13 @@ Bug fixing is an on-going task, so it is
(such as text/javascript and application/ecmascript) now share the
same script interpreter.
* Exporting 256 color indexed PNG files in Squiggle now works.
+ * Avoid an NPE in ttf2svg when resolving substitutions for Arabic script.
+ * ttf2svg now correctly writes out kerning pairs for characters that have
+ no name.
+
+5. Misc
+
+ * Minimum required Java version was raised to 1.4.
1.7beta1 -> 1.7
---------------
Modified: xmlgraphics/batik/branches/svgcolor12/README
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/README?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/README (original)
+++ xmlgraphics/batik/branches/svgcolor12/README Fri Jan 14 09:43:04 2011
@@ -45,7 +45,7 @@
Requirements
------------
- o A Java 1.3 or later compatible virtual machine for your operating system.
+ o A Java 1.4 or later compatible virtual machine for your operating system.
Optional Libraries
------------------
Modified: xmlgraphics/batik/branches/svgcolor12/contrib/rasterizertask/README
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/contrib/rasterizertask/README?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/contrib/rasterizertask/README (original)
+++ xmlgraphics/batik/branches/svgcolor12/contrib/rasterizertask/README Fri Jan 14 09:43:04 2011
@@ -22,5 +22,5 @@ work if the Ant in use is a different ve
the task. Use the same Ant version to build and to execute task to avoid
strange problems.
-At least JDK 1.3 is needed to build and execute the task.
+At least JDK 1.4 is needed to build and execute the task.
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/conf/cli.xconf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/demo/AppletDemo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/download.cgi
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/branches.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/index.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/dev/svg12.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/download.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/faq.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/faq.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/faq.xml Fri Jan 14 09:43:04 2011
@@ -379,7 +379,7 @@
<question>What are the system requirements to run Batik?</question>
<answer>
<p>
- Batik is written in the Java language and requires a version 1.3
+ Batik is written in the Java language and requires a version 1.4
implementation at this time.
</p>
</answer>
@@ -389,8 +389,8 @@
<question>How do I install Batik?</question>
<answer>
<p>
- You will need the <a href="http://java.sun.com/">JDK 1.3</a> to run
- Batik.
+ You will need a <a href="http://java.sun.com/">JRE/JDK</a> version
+ 1.4 or above to run Batik.
</p>
<p>
To install Batik you need to <a href="site:download">download</a>
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/install.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/install.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/install.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/install.xml Fri Jan 14 09:43:04 2011
@@ -40,15 +40,8 @@
<dt>Java Runtime Environment</dt>
<dd>
<p>
- A Java 1.3 or above compatible runtime environment must be present.
- Note that to support the following features a Java 1.4 or above
- JRE is required:
- </p>
- <ul>
- <li>
- SVG 1.2 <a href="dev/svg12.html#other">mouse wheel events</a>
- </li>
- </ul>
+ A Java 1.4 or above compatible runtime environment must be present.
+ </p>
</dd>
</dl>
</section>
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/status.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/status.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/status.xml Fri Jan 14 09:43:04 2011
@@ -3054,6 +3054,16 @@
An alias for <code>event</code>.
</p>
</prop>
+ <prop name="location">
+ <p>
+ Implementation of the <a href="http://www.w3.org/TR/SVGTiny12/svgudom.html#dom__Location">
+ Location</a> interface. Methods <code>assign</code> and
+ <code>reload</code> are available.
+ </p>
+ <note>
+ This interface is available since version 1.8.
+ </note>
+ </prop>
<prop name="window">
<p>
The global object (a self-reference).
@@ -3153,6 +3163,26 @@
<dd>A string holding the data.</dd>
</dl>
</func>
+ <func name="postURL" params="uri, content, function[, type, encoding]">
+ <p>
+ Sends data to the given <code>uri</code>. This method returns
+ immediately and the given <code>function</code> is called when the
+ data is fully downloaded. The optional <code>type</code> argument
+ will specify the <code>Content-Type</code> HTTP header to use, defaulting to
+ <code>text/plain</code>. The optional <code>encoding</code>
+ argument is the encoding to assume the data is in, defaulting to
+ UTF-8. The argument passed to the function is an object with
+ three properties:
+ </p>
+ <dl>
+ <dt>success</dt>
+ <dd><code>true</code> if the data is available, <code>false</code> otherwise.</dd>
+ <dt>contentType</dt>
+ <dd>The content type of the data, if it is known by the implementation.</dd>
+ <dt>content</dt>
+ <dd>A string holding the data.</dd>
+ </dl>
+ </func>
</object>
</section>
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tabs.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/font-converter.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/font-converter.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/font-converter.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/font-converter.xml Fri Jan 14 09:43:04 2011
@@ -52,7 +52,7 @@
<p>
In both cases, the options are the same:
</p>
- <source><em>ttf-path</em> <em>[</em><strong>-l</strong> <em>range-begin] [</em><strong>-h</strong> <em>range-end] [</em><strong>-ascii</strong><em>] [</em><strong>-id</strong> <em>id] [</em><strong>-o</strong> <em>output-path] [</em><strong>-testcard</strong><em>]</em></source>
+ <source><em>ttf-path</em> <em>[</em><strong>-l</strong> <em>range-begin] [</em><strong>-h</strong> <em>range-end] [</em><strong>-autorange</strong><em>] [</em><strong>-ascii</strong><em>] [</em><strong>-id</strong> <em>id] [</em><strong>-o</strong> <em>output-path] [</em><strong>-testcard</strong><em>]</em></source>
<p>
where:
</p>
@@ -67,6 +67,11 @@
<p>specifies the range of characters (by codepoint, in decimal) to be
converted,</p>
</dd>
+ <dt><strong>-autorange</strong></dt>
+ <dd>
+ <p>automatically determines the available character range, instead of using the
+ default, ASCII printable characters (ranging from 32 to 126),</p>
+ </dd>
<dt><strong>-ascii</strong></dt>
<dd>
<p>forces usage of the ASCII character map in the font, instead of the
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/index.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/rasterizer.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/rasterizer.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/rasterizer.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/tools/rasterizer.xml Fri Jan 14 09:43:04 2011
@@ -107,7 +107,7 @@
<dt><strong>-m</strong> <em>mime-type</em></dt>
<dd>
<p>
- specifies the output MIME type, which must be one of
+ specifies the output MIME type, which should be one of
<code>image/png</code>, <code>image/jpeg</code>,
<code>image/tiff</code> or <code>application/pdf</code>,
</p>
@@ -161,6 +161,10 @@
<p>specifies the CSS user stylesheet to use in addition to any
other referenced or embedded stylesheets,</p>
</dd>
+ <dt><strong>-font-family</strong> <em>defaultFontFamily</em></dt>
+ <dd>
+ <p>specifies default font family to be used when none is specified,</p>
+ </dd>
<dt><strong>-lang</strong> <em>language-code</em></dt>
<dd>
<p>specifies the
@@ -173,6 +177,12 @@
number in the range 0 < <em>quality</em> < 1 when generating
JPEG images,</p>
</dd>
+ <dt><strong>-indexed</strong> <em>1|2|4|8</em></dt>
+ <dd>
+ <p>specifies the number of bits per pixel of the output image,
+ using an adaptive pallete, resulting in an indexed image when
+ generating PNG images,</p>
+ </dd>
<dt><strong>-dpi</strong> <em>resolution</em></dt>
<dd>
<p>specifies the resolution of the output image in dots per inch,</p>
@@ -187,10 +197,20 @@
<p>specifies that the SVG files should be rasterized after
dispatching the SVG load event,</p>
</dd>
+ <dt><strong>-snapshotTime</strong></dt>
+ <dd>
+ <p>specifies the document time that should be seeked to before
+ rasterizing the document, implying -onload,</p>
+ </dd>
<dt><strong>-scriptSecurityOff</strong></dt>
<dd>
<p>specifies that any security checks on the scripts running as a
- result of dispatching the SVG load event will be bypassed, and</p>
+ result of dispatching the SVG load event will be bypassed,</p>
+ </dd>
+ <dt><strong>-anyScriptOrigin</strong></dt>
+ <dd>
+ <p>specifies that scripts can be loaded from any location, while by
+ default they can only be loaded from the same location as the document, and</p>
</dd>
<dt><strong>-scripts</strong> <em>allowed-script-types</em></dt>
<dd>
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/css.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Modified: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/extending.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/extending.xml?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/extending.xml (original)
+++ xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/extending.xml Fri Jan 14 09:43:04 2011
@@ -41,7 +41,7 @@
<p>
In general, extensions are added through the Service
Provider Interface mechanism as described in the
- <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service Provider">jar
+ <a href="http://java.sun.com/j2se/1.4/docs/guide/jar/jar.html#Service Provider">jar
file documentation</a>. This allows for the extension of Batik
simply by adding a new jar file(s) to the class path, and thus no
modification of the Batik source is required!
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/index.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/content/xdocs/using/parsers.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/resources/schema/catalog.xcat
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/sitemap.xmap
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/documentation-sources/skinconf.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/lib/build/svn-info-revision.xsl
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/anim/resources/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/DropDownHistoryModelMessages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/NameEditorDialogMessages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/apps/svgbrowser/resources/NodePickerPanelMessages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/resources/org/apache/batik/util/gui/resources/ScrollablePopupMenuMessages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/primaryDoc.svg
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocDynamic11.svg
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocDynamic12.svg
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocStatic11.svg
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/samples/tests/spec/scripting/resourceDocStatic12.svg
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/make-squiggle-app.sh.template
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/AbstractUndoableCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/DOMViewerController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/ElementOverlayController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/HistoryBrowserInterface.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/NodePickerController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/NodeTemplates.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/apps/svgbrowser/UndoableCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/ext/awt/image/codec/imageio/
('svn:mergeinfo' removed)
Modified: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/svggen/font/SVGFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/svggen/font/SVGFont.java?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/svggen/font/SVGFont.java (original)
+++ xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/svggen/font/SVGFont.java Fri Jan 14 09:43:04 2011
@@ -21,6 +21,8 @@ package org.apache.batik.svggen.font;
import java.io.FileOutputStream;
import java.io.PrintStream;
+import java.util.Set;
+import java.util.HashSet;
import org.apache.batik.svggen.font.table.CmapFormat;
import org.apache.batik.svggen.font.table.Feature;
@@ -51,7 +53,7 @@ public class SVGFont implements XMLConst
static final String PROPERTY_LINE_SEPARATOR_DEFAULT = "\n";
static final int DEFAULT_FIRST = 32;
- static final int DEFAULT_LAST = 128;
+ static final int DEFAULT_LAST = 126;
static {
String temp;
@@ -339,12 +341,18 @@ public class SVGFont implements XMLConst
Feature medi = gsub.getFeatureList().findFeature(ls, FEATURE_TAG_MEDI);
Feature fina = gsub.getFeatureList().findFeature(ls, FEATURE_TAG_FINA);
- initialSubst = (SingleSubst)
- gsub.getLookupList().getLookup(init, 0).getSubtable(0);
- medialSubst = (SingleSubst)
- gsub.getLookupList().getLookup(medi, 0).getSubtable(0);
- terminalSubst = (SingleSubst)
- gsub.getLookupList().getLookup(fina, 0).getSubtable(0);
+ if (init != null) {
+ initialSubst = (SingleSubst)
+ gsub.getLookupList().getLookup(init, 0).getSubtable(0);
+ }
+ if (medi != null) {
+ medialSubst = (SingleSubst)
+ gsub.getLookupList().getLookup(medi, 0).getSubtable(0);
+ }
+ if (fina != null) {
+ terminalSubst = (SingleSubst)
+ gsub.getLookupList().getLookup(fina, 0).getSubtable(0);
+ }
}
}
}
@@ -364,6 +372,7 @@ public class SVGFont implements XMLConst
}
// Include our requested range
+ Set glyphSet = new HashSet();
for (int i = first; i <= last; i++) {
int glyphIndex = cmapFmt.mapCharCode(i);
// ps.println(String.valueOf(i) + " -> " + String.valueOf(glyphIndex));
@@ -371,6 +380,9 @@ public class SVGFont implements XMLConst
// sb.append(font.getGlyphs()[glyphIndex].toString() + "\n");
if (glyphIndex > 0) {
+ // add glyph ID to set so we can filter later
+ glyphSet.add(glyphIndex);
+
ps.println(getGlyphAsSVG(
font,
font.getGlyph(glyphIndex),
@@ -390,7 +402,11 @@ public class SVGFont implements XMLConst
KernSubtable kst = kern.getSubtable(0);
PostTable post = (PostTable) font.getTable(Table.post);
for (int i = 0; i < kst.getKerningPairCount(); i++) {
- ps.println(getKerningPairAsSVG(kst.getKerningPair(i), post));
+ KerningPair kpair = kst.getKerningPair(i);
+ // check if left and right are both in our glyph set
+ if (glyphSet.contains(kpair.getLeft()) && glyphSet.contains(kpair.getRight())) {
+ ps.println(getKerningPairAsSVG(kpair, post));
+ }
}
}
} catch (Exception e) {
@@ -432,11 +448,14 @@ public class SVGFont implements XMLConst
// sb.append("<glyph unicode=\"").append(code).append("\"");
// Glyph name
- sb.append(XML_SPACE).append(SVG_GLYPH_NAME_ATTRIBUTE).append(XML_EQUAL_QUOT)
- // sb.append(" glyph-name=\"")
- .append(font.getPostTable().getGlyphName(glyphIndex))
- // .append("\"");
- .append(XML_CHAR_QUOT);
+ String glyphName = font.getPostTable().getGlyphName(glyphIndex);
+ if (glyphName != null) {
+ sb.append(XML_SPACE).append(SVG_GLYPH_NAME_ATTRIBUTE).append(XML_EQUAL_QUOT)
+ // sb.append(" glyph-name=\"")
+ .append(glyphName)
+ // .append("\"");
+ .append(XML_CHAR_QUOT);
+ }
}
if (horiz_advance_x != defaultHorizAdvanceX) {
sb.append(XML_SPACE).append(SVG_HORIZ_ADV_X_ATTRIBUTE).append(XML_EQUAL_QUOT)
@@ -568,16 +587,39 @@ public class SVGFont implements XMLConst
}
protected static String getKerningPairAsSVG(KerningPair kp, PostTable post) {
+ String leftGlyphName = post.getGlyphName(kp.getLeft());
+ String rightGlyphName = post.getGlyphName(kp.getRight());
+
StringBuffer sb = new StringBuffer();
- // sb.append("<hkern g1=\"");
+ // sb.append("<hkern ");
sb.append(XML_OPEN_TAG_START).append(SVG_HKERN_TAG).append(XML_SPACE);
- sb.append(SVG_G1_ATTRIBUTE).append(XML_EQUAL_QUOT);
- sb.append(post.getGlyphName(kp.getLeft()));
- // sb.append("\" g2=\"");
- sb.append(XML_CHAR_QUOT).append(XML_SPACE).append(SVG_G2_ATTRIBUTE).append(XML_EQUAL_QUOT);
+ if (leftGlyphName == null) {
+ sb.append(SVG_U1_ATTRIBUTE).append(XML_EQUAL_QUOT);
+
+ sb.append(kp.getLeft());
+ } else {
+ // sb.append("g1=\"");
+ sb.append(SVG_G1_ATTRIBUTE).append(XML_EQUAL_QUOT);
+
+ sb.append(leftGlyphName);
+ }
+
+ // sb.append("\" ");
+ sb.append(XML_CHAR_QUOT).append(XML_SPACE);
+
+ if (rightGlyphName == null) {
+ // sb.append("u2=\"");
+ sb.append(SVG_U2_ATTRIBUTE).append(XML_EQUAL_QUOT);
+
+ sb.append(kp.getRight());
+ } else {
+ // sb.append("g2=\"");
+ sb.append(SVG_G2_ATTRIBUTE).append(XML_EQUAL_QUOT);
+
+ sb.append(rightGlyphName);
+ }
- sb.append(post.getGlyphName(kp.getRight()));
// sb.append("\" k=\"");
sb.append(XML_CHAR_QUOT).append(XML_SPACE).append(SVG_K_ATTRIBUTE).append(XML_EQUAL_QUOT);
Modified: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/ParsedURLData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/ParsedURLData.java?rev=1058916&r1=1058915&r2=1058916&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/ParsedURLData.java (original)
+++ xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/ParsedURLData.java Fri Jan 14 09:43:04 2011
@@ -550,7 +550,18 @@ loop2: while (i < len) {
postConnectionURL = urlC.getURL();
}
- return (stream = urlC.getInputStream());
+ try {
+ return (stream = urlC.getInputStream());
+ } catch (IOException e) {
+ if (urlC instanceof HttpURLConnection) {
+ // bug 49889: if available, return the error stream
+ // (allow interpretation of content in the HTTP error response)
+ return (stream = ((HttpURLConnection) urlC).getErrorStream());
+ } else {
+ throw e;
+ }
+ }
+
}
/**
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/SVGFeatureStrings.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/DropDownComponent.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLDocument.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLEditorKit.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLScanner.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLToken.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/sources/org/apache/batik/util/gui/xmleditor/XMLView.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/test-resources/org/apache/batik/transcoder/wmf/resources/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL
Propchange: xmlgraphics/batik/branches/svgcolor12/test-sources/org/apache/batik/dom/ElementTraversalTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision HeadURL