Return-Path: 
 <cocoon-cvs-return-3599-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 31145 invoked by uid 500); 2 Oct 2001 10:19:09 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 31136 invoked by uid 500); 2 Oct 2001 10:19:09 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 2 Oct 2001 10:17:11 -0000
Message-ID: <20011002101711.41573.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/documentation/svg header.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    01/10/02 03:17:11

  Modified:    documentation sitemap.xmap
               documentation/stylesheets document2html.xsl site2xhtml.xsl
  Added:       documentation/svg header.xml
  Log:
  Started header image generation - needs some more work...
  
  Revision  Changes    Path
  1.8       +17 -2     xml-cocoon2/documentation/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/sitemap.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sitemap.xmap	2001/10/02 08:31:56	1.7
  +++ sitemap.xmap	2001/10/02 10:17:11	1.8
  @@ -87,7 +87,10 @@
        <map:part src="cocoon:/book.xml"/>
        <map:part src="cocoon:/body-{1}.xml"/>
       </map:aggregate>
  -    <map:transform src="stylesheets/site2xhtml.xsl"/>
  +    <map:transform src="stylesheets/site2xhtml.xsl">
  +       <map:parameter name="use-request-parameters" value="true"/>
  +       <map:parameter name="header" value="graphics/{1}-header.jpg"/>
  +     </map:transform>
       <map:serialize/>
      </map:match>
   
  @@ -96,7 +99,10 @@
        <map:part src="cocoon:/{1}/book.xml"/>
        <map:part src="cocoon:/body-{1}/{2}.xml"/>
       </map:aggregate>
  -    <map:transform src="stylesheets/site2xhtml.xsl"/>
  +    <map:transform src="stylesheets/site2xhtml.xsl">
  +       <map:parameter name="use-request-parameters" value="true"/>
  +       <map:parameter name="header" value="{1}/graphics/{2}-header.jpg"/>
  +     </map:transform>
       <map:serialize/>
      </map:match>
   
  @@ -119,6 +125,15 @@
   
      <map:match pattern="**graphics/**-label.jpg">
        <map:generate src="svg/label.xml"/>
  +     <map:transform src="svg/addlabel.xsl">
  +       <map:parameter name="use-request-parameters" value="true"/>
  +       <map:parameter name="label" value="{2}"/>
  +     </map:transform>
  +     <map:serialize type="svg2jpeg"/>
  +   </map:match>
  +
  +   <map:match pattern="**graphics/**-header.jpg">
  +     <map:generate src="svg/header.xml"/>
        <map:transform src="svg/addlabel.xsl">
          <map:parameter name="use-request-parameters" value="true"/>
          <map:parameter name="label" value="{2}"/>
  
  
  
  1.3       +8 -1      xml-cocoon2/documentation/stylesheets/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/document2html.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document2html.xsl	2001/10/01 13:39:03	1.2
  +++ document2html.xsl	2001/10/02 10:17:11	1.3
  @@ -12,7 +12,14 @@
     <!-- checks if this is the included document to avoid neverending loop -->
     <xsl:if test="not(book)">
         <document>
  -      <title><xsl:value-of select="header/title"/></title>
  +      <xsl:choose>
  +		<xsl:when test="document/header/title">
  +		      <title><xsl:value-of select="document/header/title"/></title>
  +		</xsl:when>
  +		<xsl:otherwise>
  +			<title>NO TITLE</title>
  +		</xsl:otherwise>
  +	</xsl:choose>
         <body text="#000000" link="#039acc" vlink="#0086b2" alink="#cc0000"
               topmargin="4" leftmargin="4" marginwidth="4" marginheight="4"
               bgcolor="#ffffff">
  
  
  
  1.4       +12 -4     xml-cocoon2/documentation/stylesheets/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/site2xhtml.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- site2xhtml.xsl	2001/10/01 15:15:14	1.3
  +++ site2xhtml.xsl	2001/10/02 10:17:11	1.4
  @@ -1,7 +1,13 @@
   <?xml version="1.0"?>
   
  -<html xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -      xsl:version="1.0">
  +<xsl:stylesheet
  +    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +    version="1.0">
  +
  +	<xsl:param name="header"/>
  +
  +<xsl:template match="/">
  +<html>
         <head>
           <title><xsl:value-of select="/site/document/title"/></title>
         </head>
  @@ -24,7 +30,8 @@
             </tr>
             <tr>
               <td width="100%" height="35" valign="top" align="left" colspan="2" bgcolor="#0086b2">
  -              <!-- img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{header/title}" align="right"/ -->           </td>
  +              <img src="{$header}" width="456" height="35" hspace="0" vspace="0" border="0" alt="{/site/document/title}" align="right"/>           
  +            </td>
             </tr>
             <tr>
               <td width="100%" height="20" valign="top" align="left" bgcolor="#0086b2" background="images/bottom.gif">
  @@ -102,4 +109,5 @@
   
   
   </html>
  -
  +</xsl:template>
  +</xsl:stylesheet>
  
  
  
  1.1                  xml-cocoon2/documentation/svg/header.xml
  
  Index: header.xml
  ===================================================================
  <?xml version="1.0"?>
  <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="35" width="456">
    <text style="font-family:arial; font-size:35px; font-style:italic" x="0" y="34"><label/></text>
  </svg>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org