[Yanel-dev] PDF test cases do not work anymore

[Michael Wechner]

Jonathan Addison wrote:

> Michael Wechner wrote:
>
>> Hi
>>
>> Since the FOP lib has been changed the following test cases do not 
>> work anymore:
>>
>> http://127.0.0.1:8080/yanel/test/use-cases/hello/pdf-sample.pdf
>> http://127.0.0.1:8080/yanel/test/use-cases/hello/pdf-sample2.pdf
>
>
> I have attached a patch which makes the xsl-fo files compatible with 
> FOP 0.93.


thanks a lot. Works very fine again :-) I have applied your patch.

Thanks

Michi

>
> Jonathan
>
>>
>> Any idea what might be wrong?
>>
>> Thanks
>>
>> Michi
>>
>
>------------------------------------------------------------------------
>
>Index: src/realms/use-cases/yanel/data/xslt/samplePdf2.xsl
>===================================================================
>--- src/realms/use-cases/yanel/data/xslt/samplePdf2.xsl	(revision 26843)
>+++ src/realms/use-cases/yanel/data/xslt/samplePdf2.xsl	(working copy)
>@@ -6,7 +6,7 @@
>   xmlns:fo="http://www.w3.org/1999/XSL/Format">
> 
>   <xsl:template match="/">
>-   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
>+   <fo:root>
>    
>     <fo:layout-master-set>
>      <fo:simple-page-master master-name="page"
>@@ -35,7 +35,10 @@
> 
>      <fo:page-sequence-master master-name="all">
>        <fo:repeatable-page-master-alternatives>
>-	 <fo:conditional-page-master-reference master-reference="page" page-position="first"/>
>+         <fo:conditional-page-master-reference master-reference="page" page-position="first"/>
>+         <fo:conditional-page-master-reference master-reference="page" odd-or-even="odd"/>
>+         <fo:conditional-page-master-reference master-reference="page" odd-or-even="even"/>
>+         <fo:conditional-page-master-reference master-reference="page" blank-or-not-blank="blank"/>
>        </fo:repeatable-page-master-alternatives>
>      </fo:page-sequence-master>
>     </fo:layout-master-set>
>@@ -44,20 +47,20 @@
> 
>     <fo:page-sequence master-reference="all">
>       <fo:static-content flow-name="xsl-region-before">
>-	<fo:block text-align="left" font-size="10pt" font-family="serif" line-height="14pt">
>+	    <fo:block text-align="left" font-size="10pt" font-family="serif" line-height="14pt">
>         <!--<fo:external-graphic src="file:/home/michi/src/lenya-samples/slides/resources/images/live/wyona_klein.gif"/>
> 	
>           <fo:external-graphic src="url('http://cocoon.apache.org/lenya/images/apache-lenya-light.png')"/>-->
> 	
>         </fo:block>
> 
>-      </fo:static-content> -->
>+      </fo:static-content>
> 
>       <fo:static-content flow-name="xsl-region-after">
>-	<fo:block text-align="center" font-size="10pt" font-family="serif" line-height="14pt">
>+	    <fo:block text-align="center" font-size="10pt" font-family="serif" line-height="14pt">
>           <xsl:value-of select="/s:slideset/s:metadata/s:author/s:name"/> (<xsl:value-of select="/s:slideset/s:metadata/s:author/s:email"/>), <xsl:value-of select="/s:slideset/s:metadata/s:title"/>, <xsl:value-of select="/s:slideset/s:metadata/s:confgroup/s:conftitle"/>
>         </fo:block>
>-	<fo:block text-align="center" font-size="10pt" font-family="serif" line-height="14pt">
>+	    <fo:block text-align="center" font-size="10pt" font-family="serif" line-height="14pt">
>           Seite <fo:page-number/>
> 
>         </fo:block>
>@@ -148,19 +151,18 @@
> 
>   <xsl:template match="ol">
>     <fo:list-block>
>-    <xsl:for-each select="li">
>+      <xsl:for-each select="li">
>         <fo:list-item space-before.optimum="40pt">
>           <fo:list-item-label end-indent="label-end()">
>             <fo:block font-size="18pt">&#x2022;</fo:block>
>           </fo:list-item-label>
>           <fo:list-item-body start-indent="body-start()">
>-
>             <fo:block font-size="18pt">
>               <fo:inline text-decoration="none"><xsl:apply-templates/></fo:inline>
>             </fo:block>
>           </fo:list-item-body>
>         </fo:list-item>
>-    </xsl:for-each>
>+      </xsl:for-each>
>     </fo:list-block>
>   </xsl:template>
>
>
>Index: src/contributions/resources/pdf/xslt/xml2fo.xsl
>===================================================================
>--- src/contributions/resources/pdf/xslt/xml2fo.xsl	(revision 26843)
>+++ src/contributions/resources/pdf/xslt/xml2fo.xsl	(working copy)
>@@ -11,7 +11,7 @@
>   <xsl:output method="xml"/>
> 
>   <xsl:template match="/">
>-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
>+    <fo:root>
> 
>       <fo:layout-master-set>
>         <fo:simple-page-master master-name="simple"
>@@ -19,7 +19,7 @@
>               page-width   ="21cm"
>               margin-left  ="2.5cm"
>               margin-right ="2.5cm">
>-          <fo:region-body name="xsl-region-body" margin-top="3cm"/>
>+          <fo:region-body margin-top="3cm"/>
>         </fo:simple-page-master>
>       </fo:layout-master-set>
> 
> 
>  
>
>------------------------------------------------------------------------
>
>_______________________________________________
>Yanel-development mailing list
>Yanel-development at wyona.com
>http://lists.wyona.org/cgi-bin/mailman/listinfo/yanel-development
>  
>


-- 
Michael Wechner
Wyona      -   Open Source Content Management - Yanel, Yulup
http://www.wyona.com
michael.wechner at wyona.com, michi at apache.org
+41 44 272 91 61