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/xml-apache-site/xslt/html document2html.xsl
Date Sat, 12 Oct 2002 12:50:25 GMT
jefft       2002/10/12 05:50:25

  Modified:    .        status.xml
               src/documentation/content/xdocs document-v11.xml
               src/resources/schema/dtd document-v11.mod
               src/resources/skins/avalon-site/css common.css
               src/resources/skins/avalon-site/xslt/html document2html.xsl
               src/resources/skins/basic/css style.css
               src/resources/skins/basic/xslt/html document2html.xsl
               src/resources/skins/forrest-site/css page.css
               src/resources/skins/forrest-site/xslt/html document2html.xsl
               src/resources/skins/xml-apache-site/xslt/html
                        document2html.xsl
  Log:
  Allow <p xml:space="preserve">, which lets one avoid abusing <code> to preserve
  whitespace.
  
  Revision  Changes    Path
  1.18      +4 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- status.xml	12 Oct 2002 09:41:36 -0000	1.17
  +++ status.xml	12 Oct 2002 12:50:24 -0000	1.18
  @@ -94,6 +94,10 @@
   
     <changes>
      <release version="0.1" date="2002">
  +    <action dev="JT" type="fix" context="schemas">
  +     Allow <code>xml:space='preserve'</code> attribute on &lt;p&gt;
element, which preserves
  +     space without the changed font and block display that &lt;code&gt; uses.
  +    </action>
       <action dev="JT" type="fix" context="code">
        Fixed a bug where the log files weren't being created. Thanks to Vladimir
        Bossicard for reporting.
  
  
  
  1.9       +4 -0      xml-forrest/src/documentation/content/xdocs/document-v11.xml
  
  Index: document-v11.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/document-v11.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- document-v11.xml	6 Jun 2002 14:32:39 -0000	1.8
  +++ document-v11.xml	12 Oct 2002 12:50:24 -0000	1.9
  @@ -12,6 +12,10 @@
     <body> 
       <p>This is a simple paragraph. Most documents contain a fair amount of
         paragraphs. Paragraphs are called <code>&lt;p&gt;</code>.</p>

  +    <p xml:space="preserve"
  +  >With the <code>&lt;p xml:space="preserve"&gt;</code> attribute,
you can declare
  +that whitespace should    be   preserved, without implying it is in any other
  +way special.</p>
       <p>A number of in-line elements are available in the DTD, we will show them
         inside an unordered list (<code>&lt;ul&gt;</code>):</p>

       <ul> 
  
  
  
  1.7       +3 -2      xml-forrest/src/resources/schema/dtd/document-v11.mod
  
  Index: document-v11.mod
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v11.mod,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- document-v11.mod	11 Oct 2002 07:22:35 -0000	1.6
  +++ document-v11.mod	12 Oct 2002 12:50:24 -0000	1.7
  @@ -116,7 +116,7 @@
   <!-- =============================================================== -->
   <!-- General definitions -->
   <!-- =============================================================== -->
  -<!-- A person is a general human entity -->
  +<!-- A person is a general unparsed human entity -->
   <!ELEMENT person EMPTY>
   <!ATTLIST person
     %common.att; 
  @@ -214,10 +214,11 @@
   <!-- ==================================================== -->
   <!-- Paragraphs -->
   <!-- ==================================================== -->
  -<!-- Text Paragraph (normally vertically space delimited) -->
  +<!-- Text Paragraph (normally vertically space delimited. Space can be preserved.) -->
   <!ELEMENT p (%content.mix;)*>
   <!ATTLIST p
     %common.att; 
  +  xml:space (default|preserve) #IMPLIED
   >
   <!-- Source Paragraph (normally space is preserved) -->
   <!ELEMENT source (%content.mix;)*>
  
  
  
  1.2       +5 -0      xml-forrest/src/resources/skins/avalon-site/css/common.css
  
  Index: common.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/avalon-site/css/common.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- common.css	29 May 2002 16:44:56 -0000	1.1
  +++ common.css	12 Oct 2002 12:50:25 -0000	1.2
  @@ -161,6 +161,11 @@
   .fixed {
         	font-family: Courier, Courier New, monospace;
          }
  +
  +.pre {
  +        white-space: pre;
  +     }
  +
   @media print {
   	body td {
   		font-family: Times New Roman, Zurich Bt, serif;
  
  
  
  1.2       +6 -0      xml-forrest/src/resources/skins/avalon-site/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/avalon-site/xslt/html/document2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document2html.xsl	29 May 2002 16:44:54 -0000	1.1
  +++ document2html.xsl	12 Oct 2002 12:50:25 -0000	1.2
  @@ -91,6 +91,12 @@
   <!-- paragraph section -->
   <!-- ====================================================================== -->
   
  +  <xsl:template match="p[@xml:space='preserve']">
  +    <div class="pre">
  +      <xsl:apply-templates/>
  +    </div>
  +  </xsl:template>
  + 
     <xsl:template match="p">
       <p><xsl:apply-templates/></p>
     </xsl:template>
  
  
  
  1.2       +3 -0      xml-forrest/src/resources/skins/basic/css/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/basic/css/style.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- style.css	29 May 2002 16:44:57 -0000	1.1
  +++ style.css	12 Oct 2002 12:50:25 -0000	1.2
  @@ -152,6 +152,9 @@
   .code, pre {
   	font-size: 11px;
   }
  +
  +.pre { white-space: pre;}
  +
   .section .code {
   	margin-left: -40px;
   }
  
  
  
  1.3       +5 -0      xml-forrest/src/resources/skins/basic/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/basic/xslt/html/document2html.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document2html.xsl	18 Jun 2002 12:47:18 -0000	1.2
  +++ document2html.xsl	12 Oct 2002 12:50:25 -0000	1.3
  @@ -85,6 +85,11 @@
         <xsl:apply-templates/>
       </a>
     </xsl:template>
  +  <xsl:template match="p[@xml:space='preserve']">
  +    <div class="pre">
  +      <xsl:apply-templates/>
  +    </div>
  +  </xsl:template>
     <xsl:template match="source">
       <pre class="code">
         <xsl:apply-templates/>
  
  
  
  1.7       +2 -0      xml-forrest/src/resources/skins/forrest-site/css/page.css
  
  Index: page.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/css/page.css,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page.css	4 Oct 2002 12:48:27 -0000	1.6
  +++ page.css	12 Oct 2002 12:50:25 -0000	1.7
  @@ -18,6 +18,8 @@
   table .title { background-color: #FFFFFF; width:100%; border: 0px; }
   .dida { font-size: 60%; }
   
  +.pre { white-space: pre;}
  +
   .content { padding: 5px 5px 5px 10px;  font : small;  font-size : 90%; }
   .content .ForrestTable { width: 100%; background-color: #7099C5; color: #ffffff; font-size
: 90%;}
   .content .ForrestTable caption { text-align: left; color: black; font-weight: bold; }
  
  
  
  1.10      +5 -0      xml-forrest/src/resources/skins/forrest-site/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/document2html.xsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- document2html.xsl	23 Sep 2002 07:47:41 -0000	1.9
  +++ document2html.xsl	12 Oct 2002 12:50:25 -0000	1.10
  @@ -139,6 +139,11 @@
         <xsl:apply-templates/>
       </a>
     </xsl:template>
  +  <xsl:template match="p[@xml:space='preserve']">
  +  <div class="pre">
  +    <xsl:apply-templates/>
  +  </div>
  +  </xsl:template>
     <xsl:template match="source">
       <pre class="code">
   <!-- Temporarily removed long-line-splitter ... gives out-of-memory problems -->
  
  
  
  1.2       +7 -0      xml-forrest/src/resources/skins/xml-apache-site/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/xml-apache-site/xslt/html/document2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document2html.xsl	29 May 2002 16:44:55 -0000	1.1
  +++ document2html.xsl	12 Oct 2002 12:50:25 -0000	1.2
  @@ -77,6 +77,13 @@
   	<!-- ====================================================================== -->
   	<!-- paragraph section -->
   	<!-- ====================================================================== -->
  +	<xsl:template match="p[@xml:space='preserve']">
  +		<div class="pre">
  +		<font face="verdana,helvetica,sanserif" color="black">
  +			<xsl:apply-templates/>
  +		</font>
  +		</div>
  +	</xsl:template>
   	<xsl:template match="p">
   		<p><font face="verdana,helvetica,sanserif" color="black">
   			<xsl:apply-templates/>
  
  
  

Mime
View raw message