tkormann 01/11/04 09:57:06
Modified: sources/org/apache/batik/svggen/font SVGFont.java
sources/org/apache/batik/util SVGConstants.java
Log:
remove baseline attribute on font-face element.
The new name of this attribute is "alphabetic"
Revision Changes Path
1.2 +40 -36 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGFont.java 2001/04/27 03:41:08 1.1
+++ SVGFont.java 2001/11/04 17:57:06 1.2
@@ -31,7 +31,7 @@
/**
* Converts a TrueType font to an SVG embedded font.
*
- * @version $Id: SVGFont.java,v 1.1 2001/04/27 03:41:08 vhardy Exp $
+ * @version $Id: SVGFont.java,v 1.2 2001/11/04 17:57:06 tkormann Exp $
* @author <a href="mailto:[EMAIL PROTECTED]";>David Schweinsberg</a>
*/
public class SVGFont implements XMLConstants, SVGConstants, ScriptTags, FeatureTags
{
@@ -39,6 +39,7 @@
static final String PROPERTY_LINE_SEPARATOR = "line.separator";
static final String PROPERTY_LINE_SEPARATOR_DEFAULT = "\n";
+
static {
String temp;
try {
@@ -191,40 +192,43 @@
short descent = font.getHheaTable().getDescender();
int baseline = 0; // bit 0 of head.flags will indicate if this is true
- // <!ELEMENT font-face (%descTitleMetadata;,font-face-src?,definition-src?)
>
- // <!ATTLIST font-face
- // %stdAttrs;
- // font-family CDATA #IMPLIED
- // font-style CDATA #IMPLIED
- // font-variant CDATA #IMPLIED
- // font-weight CDATA #IMPLIED
- // font-stretch CDATA #IMPLIED
- // font-size CDATA #IMPLIED
- // unicode-range CDATA #IMPLIED
- // units-per-em %Number; #IMPLIED
- // panose-1 CDATA #IMPLIED
- // stemv %Number; #IMPLIED
- // stemh %Number; #IMPLIED
- // slope %Number; #IMPLIED
- // cap-height %Number; #IMPLIED
- // x-height %Number; #IMPLIED
- // accent-height %Number; #IMPLIED
- // ascent %Number; #IMPLIED
- // descent %Number; #IMPLIED
- // widths CDATA #IMPLIED
- // bbox CDATA #IMPLIED
- // ideographic %Number; #IMPLIED
- // baseline %Number; #IMPLIED
- // centerline %Number; #IMPLIED
- // mathline %Number; #IMPLIED
- // hanging %Number; #IMPLIED
- // topline %Number; #IMPLIED
- // underline-position %Number; #IMPLIED
- // underline-thickness %Number; #IMPLIED
- // strikethrough-position %Number; #IMPLIED
- // strikethrough-thickness %Number; #IMPLIED
- // overline-position %Number; #IMPLIED
- // overline-thickness %Number; #IMPLIED >
+ // <!ELEMENT font-face
(%descTitleMetadata;,font-face-src?,definition-src?) >
+ // <!ATTLIST font-face
+ // %stdAttrs;
+ // font-family CDATA #IMPLIED
+ // font-style CDATA #IMPLIED
+ // font-variant CDATA #IMPLIED
+ // font-weight CDATA #IMPLIED
+ // font-stretch CDATA #IMPLIED
+ // font-size CDATA #IMPLIED
+ // unicode-range CDATA #IMPLIED
+ // units-per-em %Number; #IMPLIED
+ // panose-1 CDATA #IMPLIED
+ // stemv %Number; #IMPLIED
+ // stemh %Number; #IMPLIED
+ // slope %Number; #IMPLIED
+ // cap-height %Number; #IMPLIED
+ // x-height %Number; #IMPLIED
+ // accent-height %Number; #IMPLIED
+ // ascent %Number; #IMPLIED
+ // descent %Number; #IMPLIED
+ // widths CDATA #IMPLIED
+ // bbox CDATA #IMPLIED
+ // ideographic %Number; #IMPLIED
+ // alphabetic %Number; #IMPLIED
+ // mathematical %Number; #IMPLIED
+ // hanging %Number; #IMPLIED
+ // v-ideographic %Number; #IMPLIED
+ // v-alphabetic %Number; #IMPLIED
+ // v-mathematical %Number; #IMPLIED
+ // v-hanging %Number; #IMPLIED
+ // underline-position %Number; #IMPLIED
+ // underline-thickness %Number; #IMPLIED
+ // strikethrough-position %Number; #IMPLIED
+ // strikethrough-thickness %Number; #IMPLIED
+ // overline-position %Number; #IMPLIED
+ // overline-thickness %Number; #IMPLIED >
+
sb.append(XML_OPEN_TAG_START).append(SVG_FONT_FACE_TAG).append(EOL)
.append(XML_TAB).append(SVG_FONT_FAMILY_ATTRIBUTE).append(XML_EQUAL_QUOT).append(fontFamily).append(QUOT_EOL)
// .append(" font-family=\"").append(fontFamily).append("\"\r\n")
@@ -236,7 +240,7 @@
// .append(" ascent=\"").append(ascent).append("\"\r\n")
.append(XML_TAB).append(SVG_DESCENT_ATTRIBUTE).append(XML_EQUAL_QUOT).append(descent).append(QUOT_EOL)
// .append(" descent=\"").append(descent).append("\"\r\n")
-
.append(XML_TAB).append(SVG_BASELINE_ATTRIBUTE).append(XML_EQUAL_QUOT).append(baseline).append(XML_CHAR_QUOT)
+
.append(XML_TAB).append(SVG_ALPHABETIC_ATTRIBUTE).append(XML_EQUAL_QUOT).append(baseline).append(XML_CHAR_QUOT)
.append(XML_OPEN_TAG_END_NO_CHILDREN).append(EOL);
//.append(" baseline=\"").append(baseline).append("\"/>\r\n");
1.60 +2 -3 xml-batik/sources/org/apache/batik/util/SVGConstants.java
Index: SVGConstants.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/SVGConstants.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- SVGConstants.java 2001/09/28 15:40:08 1.59
+++ SVGConstants.java 2001/11/04 17:57:06 1.60
@@ -14,7 +14,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Hardy</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: SVGConstants.java,v 1.59 2001/09/28 15:40:08 hillion Exp $
+ * @version $Id: SVGConstants.java,v 1.60 2001/11/04 17:57:06 tkormann Exp $
*/
public interface SVGConstants extends CSSConstants {
@@ -133,12 +133,11 @@
/////////////////////////////////////////////////////////////////////////
String SVG_ACCENT_HEIGHT_ATTRIBUTE = "accent-height";
- String SVG_ALPHABETIC_ATTRIBUTE = "alphabetic";
String SVG_AMPLITUDE_ATTRIBUTE = "amplitude";
String SVG_ARABIC_FORM_ATTRIBUTE = "arabic-form";
String SVG_ASCENT_ATTRIBUTE = "ascent";
String SVG_AZIMUTH_ATTRIBUTE = "azimuth";
- String SVG_BASELINE_ATTRIBUTE = "baseline";
+ String SVG_ALPHABETIC_ATTRIBUTE = "alphabetic";
String SVG_BASE_FREQUENCY_ATTRIBUTE = "baseFrequency";
String SVG_BBOX_ATTRIBUTE = "bbox";
String SVG_BIAS_ATTRIBUTE = "bias";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
