works better with the current fop

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193846 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/examples/svg/Document.xsl b/docs/examples/svg/Document.xsl
index 04967e87b0698931fbc4c6e9fc3c58128a671321..6954a5c3d354ad460604206b9d1cfbdc0c4d5c1e 100644 (file)
--- a/docs/examples/svg/Document.xsl
+++ b/docs/examples/svg/Document.xsl
@@ -16,7 +16,7 @@
                                </fo:simple-page-master>
                        </fo:layout-master-set>
                        <fo:page-sequence master-name="front">
-                               <fo:flow font-size="14pt" line-height="14pt">
+                               <fo:flow font-size="14pt" line-height="14pt" flow-name="xsl-region-body">
                            <fo:block-container height="20cm" width="6cm" top="2cm" left="-1cm" position="absolute">
                                                <fo:block>
                                                        <fo:instream-foreign-object>
@@ -62,12 +62,16 @@
                                                </fo:block>
                            </fo:block-container>
                                        <fo:block-container height="1cm" width="17cm" top="1.1cm" left="0cm" position="absolute">
-                                               <fo:leader leader-pattern="rule" space-before.optimum="0pt" space-after.optimum="0pt"/>
+                                               <fo:block>
+                                                       <fo:leader leader-pattern="rule" space-before.optimum="0pt" space-after.optimum="0pt"/>
+                                               </fo:block>
                            </fo:block-container>
                                </fo:static-content>
                                <fo:static-content flow-name="xsl-region-after">
                                        <fo:block-container height="1cm" width="17cm" top="0cm" left="0cm" position="absolute">
-                                               <fo:leader leader-pattern="rule" space-before.optimum="0pt" space-after.optimum="0pt"/>
+                                               <fo:block>
+                                                       <fo:leader leader-pattern="rule" space-before.optimum="0pt" space-after.optimum="0pt"/>
+                                               </fo:block>
                            </fo:block-container>
                        <fo:block-container height="2cm" width="6cm" top="0.1cm" left="0cm" position="absolute">
                                                <fo:block font-size="10pt" font-family="serif" line-height="12pt">
@@ -87,7 +91,7 @@
                                                </fo:block>
                        </fo:block-container>
                                </fo:static-content>
-                               <fo:flow font-size="10pt" line-height="10pt">
+                               <fo:flow font-size="10pt" line-height="10pt" flow-name="xsl-region-body">
                                        <xsl:apply-templates select="Summary"/>
                                        <xsl:apply-templates select="ExternalChapter|Chapter"/>
                                </fo:flow>
@@ -154,7 +158,9 @@
                <xsl:if test="not(position()=1)">
                        <fo:block break-before="page"/>
                </xsl:if>
-               <fo:leader leader-pattern="rule" rule-thickness="1.5pt" space-before.optimum="5pt" space-after.optimum="4pt"/>
+               <fo:block>
+                       <fo:leader leader-pattern="rule" rule-thickness="1.5pt" space-before.optimum="5pt" space-after.optimum="4pt"/>
+               </fo:block>
                <fo:block font-weight="bold" font-size="18pt" line-height="18pt"><xsl:apply-templates select="Title"/></fo:block>
                <xsl:apply-templates select="ExternalDiagram|ExternalSVG"/>
                <xsl:apply-templates select="Body"/>
@@ -183,7 +189,9 @@
        </xsl:template>
 
        <xsl:template match="Section">
-               <fo:leader leader-pattern="rule" space-before.optimum="8pt"/>
+               <fo:block>
+                       <fo:leader leader-pattern="rule" space-before.optimum="8pt"/>
+               </fo:block>
                <fo:block font-weight="bold" font-size="14pt" line-height="14pt" space-before.optimum="2pt"><xsl:apply-templates select="Title"/></fo:block>
 
                <xsl:apply-templates select="ExternalDiagram|ExternalSVG"/>
@@ -194,7 +202,9 @@
        </xsl:template>
 
        <xsl:template match="SubSection">
-               <fo:leader leader-pattern="rule" space-before.optimum="6pt"/>
+               <fo:block>
+                       <fo:leader leader-pattern="rule" space-before.optimum="6pt"/>
+               </fo:block>
                <fo:block font-weight="bold" font-size="12pt" line-height="12pt" space-before.optimum="2pt"><xsl:apply-templates select="Title"/></fo:block>
 
                <xsl:apply-templates select="ExternalDiagram|ExternalSVG"/>

diff --git a/docs/examples/svg/misc-diagrams.xml b/docs/examples/svg/misc-diagrams.xml
index 1376472f0de655e22e5968eda02125076ef4dd9f..669faf541990eea6ce26875aa1bb20c254b4191d 100644 (file)
--- a/docs/examples/svg/misc-diagrams.xml
+++ b/docs/examples/svg/misc-diagrams.xml
@@ -523,7 +523,6 @@ x="111.963" y="10">Cl</svg:text>
 <svg:svg width="553" height="737"
 style="text-antialiasing:true; stroke-antialiasing:true">
 <svg:desc>Picasso.pdx exported by Mayura Draw 3.6</svg:desc>
-<svg:g transform="translate(-20,1546)"> <!-- translation to put it in correct area -->
 <svg:rect style="stroke:none;fill:#ffe05e"
 transform="matrix(1 0 0 -1 -14.49 755.5 )"
 x="37.4595" y="102.649" width="509.351" height="636.324"/>
@@ -3600,7 +3599,6 @@ x="51.9142" y="105.568" width="515.329" height="13.927"/>
 <svg:rect style="stroke:#ffffff;stroke-width:1;fill:#ffffff"
 transform="matrix(1 0 0 -1 -27.62 758.4 )"
 x="558.487" y="102.649" width="13.135" height="646.54"/>
-</svg:g>
 
 <svg:g transform="matrix(1 0 0 1 286.4 683.7 )"
 style="fill:#000000;font-family:Arial; font-size:18; font-weight:bold;text-align:center"