forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/common/xslt/html document2html.xsl
Date Fri, 12 Sep 2003 10:25:55 GMT
stevenn     2003/09/12 03:25:55

  Modified:    src/documentation/content/xdocs document-v12.xml
               src/resources/schema/dtd document-v12.mod
               src/resources/skins/common/xslt/fo document2fo.xsl
               src/resources/skins/common/xslt/html document2html.xsl
  Log:
  adding @label support for notes and warning
  
  Revision  Changes    Path
  1.3       +3 -1      xml-forrest/src/documentation/content/xdocs/document-v12.xml
  
  Index: document-v12.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/document-v12.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document-v12.xml	13 Aug 2003 10:34:55 -0000	1.2
  +++ document-v12.xml	12 Sep 2003 10:25:54 -0000	1.3
  @@ -126,7 +126,9 @@
         <note>Use the <code>&lt;note&gt;</code> element to draw
attention to something, e.g. ...The <code>&lt;code&gt;</code> element
is used when the author can't
           express himself clearly using normal sentences ;-)</note>
         <warning>Sleep deprivation can be the result of being involved in an open
  -        source project. (a.k.a. the <code>&lt;warning&gt;</code> element).</warning>

  +        source project. (a.k.a. the <code>&lt;warning&gt;</code> element).</warning>
  +      <note label="Important">If you want your own labels for notes and warnings,
specify them
  +        using the <code>label</code> attribute.</note>
         <p>Apart from unordered lists, we have ordered lists too, of course.</p>

         <ol> 
           <li>Item 1</li> 
  
  
  
  1.3       +2 -0      xml-forrest/src/resources/schema/dtd/document-v12.mod
  
  Index: document-v12.mod
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v12.mod,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document-v12.mod	24 Apr 2003 05:52:41 -0000	1.2
  +++ document-v12.mod	12 Sep 2003 10:25:55 -0000	1.3
  @@ -241,11 +241,13 @@
   <!-- Note Paragraph (normally shown encapsulated) -->
   <!ELEMENT note (%content.mix;)*>
   <!ATTLIST note
  +  label CDATA #IMPLIED
     %common.att; 
   >
   <!-- Warning Paragraph (normally shown with eye-catching colors) -->
   <!ELEMENT warning (%content.mix;)*>
   <!ATTLIST warning
  +  label CDATA #IMPLIED
     %common.att; 
   >
   <!-- Fixme Paragraph (normally not shown) -->
  
  
  
  1.16      +8 -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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- document2fo.xsl	8 Aug 2003 17:32:54 -0000	1.15
  +++ document2fo.xsl	12 Sep 2003 10:25:55 -0000	1.16
  @@ -437,7 +437,10 @@
         border-color="#D00000"
         background-color="#D00000"
         color="#ffffff">
  -      Warning: <xsl:value-of select="title"/>
  +      <xsl:choose>
  +        <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
  +        <xsl:otherwise>Note: </xsl:otherwise>
  +      </xsl:choose><xsl:value-of select="title"/>       
       </fo:block>
       <fo:block
         margin-left="0.25in"
  @@ -472,7 +475,10 @@
         border-end-style="solid"
         border-color="#A0C9F5"
         background-color="#A0C9F5">
  -      Note: <xsl:value-of select="title"/>
  +      <xsl:choose>
  +        <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
  +        <xsl:otherwise>Note: </xsl:otherwise>
  +      </xsl:choose><xsl:value-of select="title"/>
       </fo:block>
       <fo:block
         margin-left="0.25in"
  
  
  
  1.32      +2 -1      xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- document2html.xsl	9 Sep 2003 20:44:29 -0000	1.31
  +++ document2html.xsl	12 Sep 2003 10:25:55 -0000	1.32
  @@ -202,6 +202,7 @@
       <div class="frame {local-name()}">
         <div class="label">
           <xsl:choose>
  +          <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
             <xsl:when test="local-name() = 'note'">Note</xsl:when>
             <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
             <xsl:otherwise>Fixme (<xsl:value-of select="@author"/>)</xsl:otherwise>
  
  
  

Mime
View raw message