forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject cvs commit: xml-forrest/src/resources/stylesheets changes2rss.xsl directory2book.xsl docbook2document.xsl docv10todocv11.xsl docv20todocv12.xsl dtdx2flat.xsl html2document.xsl profile2page.xsl site2site-selectnode.xsl text2document.xsl wiki2document.xsl wiki2html.xsl wiki2htmlpage.xsl
Date Wed, 30 Jul 2003 08:37:54 GMT
cheche      2003/07/30 01:37:54

  Modified:    .        status.xml
               src/resources/conf forrest.xmap sitemap.xmap
               src/resources/stylesheets changes2rss.xsl directory2book.xsl
                        docbook2document.xsl docv10todocv11.xsl
                        docv20todocv12.xsl dtdx2flat.xsl html2document.xsl
                        profile2page.xsl site2site-selectnode.xsl
                        text2document.xsl wiki2document.xsl wiki2html.xsl
                        wiki2htmlpage.xsl
  Log:
  Remove indent attr from the xsl:output as it is define on serializer.
  Move xsl:output for *2document.xsl to "xml-document" serializer.
  
  Revision  Changes    Path
  1.184     +9 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.183
  retrieving revision 1.184
  diff -u -r1.183 -r1.184
  --- status.xml	28 Jul 2003 10:19:45 -0000	1.183
  +++ status.xml	30 Jul 2003 08:37:54 -0000	1.184
  @@ -25,6 +25,15 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="JJP" type="fix" context="core">
  +        Cleanup maps:components definitions on sub-maps.
  +	Remove indent attr from the xsl:output as it is define on serializer.
  +	Move xsl:output for *2document.xsl to "xml-document" serializer.
  +      </action>
  +      <action dev="JJP" type="fix" context="skin"
  +        due-to="Eirik Bjørsnøs"  due-to-email="bjorsnos@stud.ntnu.no" >
  +	abstract element was ignored for html output.
  +      </action>
         <action dev="JJP" type="fix" context="skin"
           due-to="Ramón Prades" due-to-email="rprades@porcelanosa.com" >
           Unescape strings, so they display propertly  on the trail for all skins.
  
  
  
  1.24      +8 -7      xml-forrest/src/resources/conf/forrest.xmap
  
  Index: forrest.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- forrest.xmap	29 Jul 2003 09:45:19 -0000	1.23
  +++ forrest.xmap	30 Jul 2003 08:37:54 -0000	1.24
  @@ -92,6 +92,7 @@
             <map:parameter name="parameter-selector-test" value="{sourcetype}" />
   
             <map:when test="document-v10">
  +          <!-- FIXME (JJP):  This should use the v12 now-->
               <map:transform src="resources/stylesheets/docv10todocv11.xsl" />
             </map:when>
   
  @@ -178,7 +179,7 @@
               <map:generate src="content/xdocs/{1}.ihtml" type="html" />
               <map:transform src="resources/stylesheets/html2document.xsl" />
               <map:transform type="idgen" />
  -            <map:serialize type="xml"/>
  +            <map:serialize type="xml-document"/>
             </map:when>
   
             <map:when test="content/xdocs/{1}.cwiki">
  @@ -195,17 +196,17 @@
                   <map:parameter name="name" value="{2}" />
                 </map:transform>
                 <map:transform type="idgen" />
  -              <map:serialize type="xml"/>
  +              <map:serialize type="xml-document"/>
               </map:match>
             </map:when>
   
  -          <map:when test="content/{1}.txt">
  +          <map:when test="content/xdocs/{1}.txt">
               <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
  -              <map:generate type="text2xml" src="content/{1}{2}.txt" />
  +              <map:generate type="text2xml" src="content/xdocs/{1}{2}.txt" />
                 <map:transform src="resources/stylesheets/text2document.xsl">
                   <map:parameter name="filename" value="{2}" />
                 </map:transform>
  -              <map:serialize type="xml"/>
  +              <map:serialize type="xml-document"/>
               </map:match>
             </map:when>
   
  @@ -214,7 +215,7 @@
               <map:call resource="transform-to-document">
                 <map:parameter name="src" value="content/xdocs/{1}.xml" />
               </map:call>
  -            <map:serialize type="xml"/>
  +            <map:serialize type="xml-document"/>
             </map:otherwise>
   
           </map:select>
  
  
  
  1.114     +7 -4      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.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- sitemap.xmap	29 Jul 2003 09:45:19 -0000	1.113
  +++ sitemap.xmap	30 Jul 2003 08:37:54 -0000	1.114
  @@ -80,11 +80,14 @@
         <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer">
           <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
           <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
  -        <encoding>ISO-8859-1</encoding>
         </map:serializer>
   
  -      <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
  -        <encoding>ISO-8859-1</encoding>
  +      <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
  +      
  +      <map:serializer name="xml-document" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
  +        <cdata-section-elements>source</cdata-section-elements>
  +        <doctype-public>-//APACHE//DTD Documentation V1.2//EN</doctype-public>
  +        <doctype-system>document-v12.dtd</doctype-system>
         </map:serializer>
   
         <map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf" />
  
  
  
  1.3       +0 -1      xml-forrest/src/resources/stylesheets/changes2rss.xsl
  
  Index: changes2rss.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/changes2rss.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes2rss.xsl	4 Jan 2003 03:56:14 -0000	1.2
  +++ changes2rss.xsl	30 Jul 2003 08:37:54 -0000	1.3
  @@ -7,7 +7,6 @@
     <xsl:output method = "xml"
       version="1.0" 
       encoding="ISO-8859-1" 
  -    indent="yes"  
       doctype-public="-//Netscape Communications//DTD RSS 0.91//EN"                   
       doctype-system="http://my.netscape.com/publish/formats/rss-0.91.dtd"              
    
       />
  
  
  
  1.7       +0 -2      xml-forrest/src/resources/stylesheets/directory2book.xsl
  
  Index: directory2book.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/directory2book.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- directory2book.xsl	22 Jul 2003 05:26:39 -0000	1.6
  +++ directory2book.xsl	30 Jul 2003 08:37:54 -0000	1.7
  @@ -30,8 +30,6 @@
   
     <xsl:output doctype-system="book-cocoon-v10.dtd" doctype-public="-//APACHE//DTD Cocoon
Documentation Book V1.0//EN"/>
   
  -  <xsl:output indent="yes"/>
  -
     <xsl:param name="expected-extension" select="'xml'"/>
   
     <xsl:variable name="ext" select="concat('.', $expected-extension)"/>
  
  
  
  1.13      +0 -1      xml-forrest/src/resources/stylesheets/docbook2document.xsl
  
  Index: docbook2document.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/docbook2document.xsl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- docbook2document.xsl	5 Jul 2003 07:15:00 -0000	1.12
  +++ docbook2document.xsl	30 Jul 2003 08:37:54 -0000	1.13
  @@ -13,7 +13,6 @@
   
   -->
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  -      <xsl:output method="xml" indent="yes" doctype-system="http://localhost/forrest/dtd/document-v11.dtd"
doctype-public="-//APACHE//DTD Documentation V1.1//EN" encoding="UTF-8"/>
   
         <xsl:template match="/">
               <xsl:apply-templates select="book|chapter|revhistory|article"/>
  
  
  
  1.8       +0 -2      xml-forrest/src/resources/stylesheets/docv10todocv11.xsl
  
  Index: docv10todocv11.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/docv10todocv11.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- docv10todocv11.xsl	10 Sep 2002 08:05:58 -0000	1.7
  +++ docv10todocv11.xsl	30 Jul 2003 08:37:54 -0000	1.8
  @@ -7,8 +7,6 @@
     <xsl:output 
        doctype-public="-//APACHE//DTD Documentation V1.1//EN"
        doctype-system="document-v11.dtd"
  -     indent="yes"
  -         
         />
        
   
  
  
  
  1.3       +0 -6      xml-forrest/src/resources/stylesheets/docv20todocv12.xsl
  
  Index: docv20todocv12.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/docv20todocv12.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- docv20todocv12.xsl	6 May 2003 04:32:22 -0000	1.2
  +++ docv20todocv12.xsl	30 Jul 2003 08:37:54 -0000	1.3
  @@ -2,12 +2,6 @@
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <!-- document-v20x.dtd to document-v12.dtd transformation -->
   
  -  <!-- normally, I would include something like this:-->
  -  <xsl:output 
  -     doctype-public="-//APACHE//DTD Documentation V1.2//EN"
  -     doctype-system="document-v1.2.dtd"
  -     indent="no" />
  -     
     <xsl:template match="/">
       <xsl:apply-templates/>
     </xsl:template>
  
  
  
  1.2       +0 -2      xml-forrest/src/resources/stylesheets/dtdx2flat.xsl
  
  Index: dtdx2flat.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/dtdx2flat.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dtdx2flat.xsl	11 Jul 2002 08:54:54 -0000	1.1
  +++ dtdx2flat.xsl	30 Jul 2003 08:37:54 -0000	1.2
  @@ -1,7 +1,5 @@
   <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
   
  - <xsl:output indent="yes"/>
  -
    <xsl:template match='/'>
     <xsl:apply-templates/>
    </xsl:template>
  
  
  
  1.2       +0 -8      xml-forrest/src/resources/stylesheets/html2document.xsl
  
  Index: html2document.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/html2document.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- html2document.xsl	15 Jan 2003 11:55:38 -0000	1.1
  +++ html2document.xsl	30 Jul 2003 08:37:54 -0000	1.2
  @@ -4,14 +4,6 @@
       version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -    <xsl:output method = "xml"  
  -                version="1.0"
  -                omit-xml-declaration="no" 
  -                indent="no"
  -                encoding="ISO-8859-1"
  -                doctype-system="document-v11.dtd"
  -                doctype-public="-//APACHE//DTD Documentation V1.1//EN" />
  -
       <xsl:key name="h2s" match="h2" use="generate-id(preceding-sibling::h1[1])"/>
       <xsl:key name="h3s" match="h3" use="generate-id(preceding-sibling::h2[1])"/>
       <xsl:key name="h4s" match="h4" use="generate-id(preceding-sibling::h3[1])"/>
  
  
  
  1.3       +0 -2      xml-forrest/src/resources/stylesheets/profile2page.xsl
  
  Index: profile2page.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/profile2page.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- profile2page.xsl	5 Jul 2003 13:03:52 -0000	1.2
  +++ profile2page.xsl	30 Jul 2003 08:37:54 -0000	1.3
  @@ -5,8 +5,6 @@
   
    <xsl:import href="xml2html.xsl"/>
   
  - <xsl:output indent="yes"/>
  -
    <xsl:param name="key"/>
    <xsl:param name="result"/>
    <xsl:param name="component"/>
  
  
  
  1.4       +0 -2      xml-forrest/src/resources/stylesheets/site2site-selectnode.xsl
  
  Index: site2site-selectnode.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/site2site-selectnode.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- site2site-selectnode.xsl	9 Jun 2003 10:27:40 -0000	1.3
  +++ site2site-selectnode.xsl	30 Jul 2003 08:37:54 -0000	1.4
  @@ -8,8 +8,6 @@
   
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:l="http://apache.org/forrest/linkmap/1.0">
   
  -  <xsl:output indent="yes"/>
  -
     <xsl:param name="path" select="'index'"/>
   
     <xsl:variable name="tab">
  
  
  
  1.3       +1 -7      xml-forrest/src/resources/stylesheets/text2document.xsl
  
  Index: text2document.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/text2document.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- text2document.xsl	22 Jul 2003 05:24:42 -0000	1.2
  +++ text2document.xsl	30 Jul 2003 08:37:54 -0000	1.3
  @@ -9,12 +9,6 @@
   <xsl:stylesheet version="1.0"
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<xsl:output indent="yes" 
  -            method="xml"
  -	    doctype-public="-//APACHE//DTD Documentation V1.2//EN"
  -	    doctype-system="document-v12.dtd"
  -            cdata-section-elements="source"/>
  -
     <xsl:param name="filename"/>
   
     <xsl:template match="/">
  
  
  
  1.9       +0 -6      xml-forrest/src/resources/stylesheets/wiki2document.xsl
  
  Index: wiki2document.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/wiki2document.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- wiki2document.xsl	18 May 2003 12:28:06 -0000	1.8
  +++ wiki2document.xsl	30 Jul 2003 08:37:54 -0000	1.9
  @@ -4,12 +4,6 @@
                   xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/1.0"
                   exclude-result-prefixes="st">
   
  - <xsl:output indent="yes" 
  -             method="html"
  -             doctype-public="-//APACHE//DTD Documentation V1.1//EN"
  -             doctype-system="document-v11.dtd"
  -             cdata-section-elements="source"/>
  -
    <xsl:param name="name"/>
   
    <xsl:template match="st:document">
  
  
  
  1.2       +1 -1      xml-forrest/src/resources/stylesheets/wiki2html.xsl
  
  Index: wiki2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/wiki2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wiki2html.xsl	5 Feb 2003 16:12:14 -0000	1.1
  +++ wiki2html.xsl	30 Jul 2003 08:37:54 -0000	1.2
  @@ -3,7 +3,7 @@
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
                   xmlns:wiki="http://chaperon.sourceforge.net/grammar/wiki/1.0">
   
  - <xsl:output indent="yes" method="xml"/>
  + <xsl:output method="xml"/>
   
    <xsl:template match="wiki:wiki">
       <xsl:apply-templates/>
  
  
  
  1.2       +1 -1      xml-forrest/src/resources/stylesheets/wiki2htmlpage.xsl
  
  Index: wiki2htmlpage.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/wiki2htmlpage.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wiki2htmlpage.xsl	5 Feb 2003 16:12:14 -0000	1.1
  +++ wiki2htmlpage.xsl	30 Jul 2003 08:37:54 -0000	1.2
  @@ -3,7 +3,7 @@
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
                   xmlns:wiki="http://chaperon.sourceforge.net/grammar/wiki/1.0">
   
  - <xsl:output indent="yes" method="xml"/>
  + <xsl:output method="xml"/>
   
    <xsl:template match="/">
     <html>
  
  
  

Mime
View raw message