deweese 02/05/22 04:51:06
Modified: sources/org/apache/batik/extension/svg
BatikMultiImageElement.java
BatikMultiImageElementBridge.java
sources/org/apache/batik/svggen/font SVGFont.java
Log:
1) MultiImage now respects xml:base
2) ttf2svg now emits kern elements with the proper sign.
Revision Changes Path
1.2 +2 -2
xml-batik/sources/org/apache/batik/extension/svg/BatikMultiImageElement.java
Index: BatikMultiImageElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/extension/svg/BatikMultiImageElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BatikMultiImageElement.java 20 Feb 2002 13:27:10 -0000 1.1
+++ BatikMultiImageElement.java 22 May 2002 11:51:06 -0000 1.2
@@ -14,7 +14,7 @@
import org.apache.batik.extension.PrefixableStylableExtensionElement;
/**
- * This class implements a multiImage extension to SVG.
+ * This class implements a multiImage extension to SVG.
*
* The 'multiImage' element is similar to the 'image' element (supports
* all the same attributes and properties) except.
@@ -32,7 +32,7 @@
* </ol>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thomas DeWeese</a>
- * @version $Id: BatikMultiImageElement.java,v 1.1 2002/02/20 13:27:10 deweese Exp
$ */
+ * @version $Id: BatikMultiImageElement.java,v 1.2 2002/05/22 11:51:06 deweese Exp
$ */
public class BatikMultiImageElement
extends PrefixableStylableExtensionElement
implements BatikExtConstants {
1.3 +7 -4
xml-batik/sources/org/apache/batik/extension/svg/BatikMultiImageElementBridge.java
Index: BatikMultiImageElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/extension/svg/BatikMultiImageElementBridge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BatikMultiImageElementBridge.java 20 Feb 2002 13:27:10 -0000 1.2
+++ BatikMultiImageElementBridge.java 22 May 2002 11:51:06 -0000 1.3
@@ -61,7 +61,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thomas DeWeese</a>
- * @version $Id: BatikMultiImageElementBridge.java,v 1.2 2002/02/20 13:27:10
deweese Exp $
+ * @version $Id: BatikMultiImageElementBridge.java,v 1.3 2002/05/22 11:51:06
deweese Exp $
*/
public class BatikMultiImageElementBridge extends SVGImageElementBridge
implements BatikExtConstants {
@@ -179,9 +179,12 @@
throw new BridgeException(e, ERR_ATTRIBUTE_MISSING,
new Object[] {"xlink:href"});
}
- SVGDocument svgDoc = (SVGDocument)e.getOwnerDocument();
- URL baseURL = ((SVGOMDocument)svgDoc).getURLObject();
- ParsedURL purl = new ParsedURL(baseURL, uriStr);
+
+ String baseURI = XMLBaseSupport.getCascadedXMLBase(e);
+ ParsedURL purl;
+ if (baseURI == null) purl = new ParsedURL(uriStr);
+ else purl = new ParsedURL(baseURI, uriStr);
+
dims.add(d);
uris.add(purl);
}
1.3 +3 -2 xml-batik/sources/org/apache/batik/svggen/font/SVGFont.java
Index: SVGFont.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/font/SVGFont.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGFont.java 4 Nov 2001 17:57:06 -0000 1.2
+++ SVGFont.java 22 May 2002 11:51:06 -0000 1.3
@@ -31,7 +31,7 @@
/**
* Converts a TrueType font to an SVG embedded font.
*
- * @version $Id: SVGFont.java,v 1.2 2001/11/04 17:57:06 tkormann Exp $
+ * @version $Id: SVGFont.java,v 1.3 2002/05/22 11:51:06 deweese Exp $
* @author <a href="mailto:[EMAIL PROTECTED]";>David Schweinsberg</a>
*/
public class SVGFont implements XMLConstants, SVGConstants, ScriptTags, FeatureTags
{
@@ -554,7 +554,8 @@
// sb.append("\" k=\"");
sb.append(XML_CHAR_QUOT).append(XML_SPACE).append(SVG_K_ATTRIBUTE).append(XML_EQUAL_QUOT);
- sb.append(kp.getValue());
+ // SVG kerning values are inverted from TrueType's.
+ sb.append(-kp.getValue());
// sb.append("\"/>");
sb.append(XML_CHAR_QUOT).append(XML_OPEN_TAG_END_NO_CHILDREN);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
