forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/common/xslt/fo document2fo.xsl
Date Sun, 18 May 2003 12:17:11 GMT
jefft       2003/05/18 05:17:11

  Modified:    .        status.xml
               src/resources/conf sitemap.xmap
               src/resources/skins/common/xslt/fo document2fo.xsl
  Log:
  Add a flag to document2fo.xsl to allow prevention of section numbering.  This
  is useful if numbers have already been added for some reason, as in the case of
  FAQs.
  
  Revision  Changes    Path
  1.161     +5 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.160
  retrieving revision 1.161
  diff -u -r1.160 -r1.161
  --- status.xml	18 May 2003 10:21:39 -0000	1.160
  +++ status.xml	18 May 2003 12:17:10 -0000	1.161
  @@ -25,6 +25,10 @@
     <changes>
       <release version="0.5-dev" date="unreleased">
         <action dev="JT" type="fix" context="core">
  +        Make FAQ 'Questions' section more legible, and avoid duplicate numbering
  +        in FAQ PDF.
  +      </action>
  +      <action dev="JT" type="fix" context="core">
           Links to subdirectories no longer blow up the command-line rendering.
         </action>
         <action dev="JT" type="update" context="shbat">
  @@ -791,7 +795,7 @@
         </actions>
   
         <actions priority="medium">
  -        <action context="code" dev="NKB">
  +         <action context="code" dev="NKB">
             Finish the RSS feed for status.xml.
             Aggregate status.xml and project.xml to have all needed project data.
           </action>    
  
  
  
  1.95      +13 -0     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- sitemap.xmap	7 May 2003 23:48:06 -0000	1.94
  +++ sitemap.xmap	18 May 2003 12:17:10 -0000	1.95
  @@ -157,6 +157,19 @@
           </map:call>
         </map:match>
   
  +
  +      <!-- Special matcher for FAQ PDFs, so we can pass an extra
  +      'numbersections' param into document2fo.xsl -->
  +      <map:match pattern="**faq.pdf">
  +        <map:generate src="cocoon:/{1}faq.xml"/>
  +        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  +          <map:parameter name="numbersections" value="false"/>
  +          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
  +        </map:transform>
  +        <map:serialize type="fo2pdf"/>
  +      </map:match>
  +
         <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
           <map:generate src="cocoon:/{1}{2}.xml"/>
           <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  
  
  
  1.12      +5 -2      xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- document2fo.xsl	14 May 2003 03:46:51 -0000	1.11
  +++ document2fo.xsl	18 May 2003 12:17:11 -0000	1.12
  @@ -5,6 +5,7 @@
                   version="1.0">
   
     <xsl:output method="xml"/>
  +  <xsl:param name="numbersections" select="'true'"/>
     <xsl:param name="ctxbasedir" select="."/>
     <xsl:param name="xmlbasedir"/>
     <xsl:include href="pdfoutline.xsl"/>
  @@ -222,8 +223,10 @@
         space-after="4pt"
         id="{generate-id()}">
   
  -      <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
  -      <xsl:text>. </xsl:text>
  +      <xsl:if test="$numbersections = 'true'">
  +        <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
  +        <xsl:text>. </xsl:text>
  +      </xsl:if>
         <xsl:value-of select="title"/>
   
         <xsl:if test="normalize-space(@id)!=''">
  
  
  

Mime
View raw message