cvs commit: xml-batik/sources/org/apache/batik/extension/svg BatikExtConstants.java SVGFlowTextElementBridge.java

[deweese]

deweese     2002/11/15 07:46:51

  Modified:    samples/extensions flowText.svg
               sources/org/apache/batik/extension/svg
                        BatikExtConstants.java
                        SVGFlowTextElementBridge.java
  Log:
  Name of 'region' tag in flowText is now flowLaout.
  
  Revision  Changes    Path
  1.7       +6 -5      xml-batik/samples/extensions/flowText.svg
  
  Index: flowText.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/samples/extensions/flowText.svg,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- flowText.svg      30 Apr 2002 19:08:47 -0000      1.6
  +++ flowText.svg      15 Nov 2002 15:46:50 -0000      1.7
  @@ -36,10 +36,11 @@
   
         <batik:flowText xmlns:batik="http://xml.apache.org/batik/ext";
                font-size="20" xml:space="preserve">
  -         <batik:flowRegion>
  -         <batik:region x="17"  y="80" width="200" height="400"/>
  -         <batik:region x="233" y="80" width="200" height="400"/>
  -         </batik:flowRegion>
  +         <batik:flowLayout>
  +         <batik:flowRegion x="17"  y="80" width="200" height="400"/>
  +         <batik:flowRegion x="233" y="80" width="200" height="400"/>
  +         </batik:flowLayout>
  +
            <batik:flowDiv>
            <batik:flowPara first-line-left-margin="20" bottom-margin="10" >This is an 
<batik:flowSpan font-size="40" fill="crimson">ex&#x00AD;ample</batik:flowSpan> of a 
very long string that is split &#x200D;across multi&#x00AD;ple lines via text 
wrap&#x0AD;ping.</batik:flowPara>
            <batik:flowPara justification="middle" top-margin="10" left-margin="10" 
right-margin="10" bottom-margin="10"><batik:flowLine>Now check if text wrapping 
handles a number of tricky</batik:flowLine> situations: 
averylongrunonwordthatspansmultiplelines<batik:flowSpan 
font-weight="bold">with<batik:flowSpan 
fill="crimson">embedded</batik:flowSpan>span</batik:flowSpan>elements &amp; 
<batik:flowSpan fill="green" dy="-.3em" 
font-size="80%">super</batik:flowSpan><batik:flowSpan dy=".3em"> or 
</batik:flowSpan><batik:flowSpan fill="darkgreen" dy=".3em" 
font-size="80%">sub</batik:flowSpan><batik:flowSpan dy="-.3em"> 
scripts.</batik:flowSpan></batik:flowPara>
  
  
  
  1.13      +3 -3      
xml-batik/sources/org/apache/batik/extension/svg/BatikExtConstants.java
  
  Index: BatikExtConstants.java
  ===================================================================
  RCS file: 
/home/cvs/xml-batik/sources/org/apache/batik/extension/svg/BatikExtConstants.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BatikExtConstants.java    22 May 2002 21:50:40 -0000      1.12
  +++ BatikExtConstants.java    15 Nov 2002 15:46:50 -0000      1.13
  @@ -28,11 +28,11 @@
           "flowText";
   
       /** Tag name for Batik's flowText extension Region element (SVG 1.1). */
  +    public static final String BATIK_EXT_FLOW_LAYOUT_TAG = 
  +        "flowLayout";
  +    /** Tag name for Batik's flowText extension Region element (SVG 1.1). */
       public static final String BATIK_EXT_FLOW_REGION_TAG = 
           "flowRegion";
  -    /** Tag name for Batik's flowText extension Region element (SVG 1.1). */
  -    public static final String BATIK_EXT_REGION_TAG = 
  -        "region";
   
       /** Attribute name for x attribute */
       public static final String BATIK_EXT_X_ATTRIBUTE = 
  
  
  
  1.7       +3 -3      
xml-batik/sources/org/apache/batik/extension/svg/SVGFlowTextElementBridge.java
  
  Index: SVGFlowTextElementBridge.java
  ===================================================================
  RCS file: 
/home/cvs/xml-batik/sources/org/apache/batik/extension/svg/SVGFlowTextElementBridge.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SVGFlowTextElementBridge.java     22 May 2002 21:50:40 -0000      1.6
  +++ SVGFlowTextElementBridge.java     15 Nov 2002 15:46:50 -0000      1.7
  @@ -345,7 +345,7 @@
               Element e = (Element)n;
   
               String ln = n.getLocalName();
  -            if (ln.equals(BATIK_EXT_FLOW_REGION_TAG)) {
  +            if (ln.equals(BATIK_EXT_FLOW_LAYOUT_TAG)) {
                   return gatherRects(ctx, e);
               }
           }
  @@ -361,7 +361,7 @@
               Element e = (Element)n;
   
               String ln = n.getLocalName();
  -            if (ln.equals(BATIK_EXT_REGION_TAG)) {
  +            if (ln.equals(BATIK_EXT_FLOW_REGION_TAG)) {
                   UnitProcessor.Context uctx;
                   uctx = UnitProcessor.createContext(ctx, e);
                   Rectangle2D r2d = buildRect(uctx, e);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]