forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/forrest-site/xslt/html book2menu.xsl document2html.xsl site2xhtml.xsl tab2menu.xsl
Date Tue, 30 Jul 2002 01:29:24 GMT
crossley    2002/07/29 18:29:24

  Modified:    src/resources/skins/forrest-site/css page.css
               src/resources/skins/forrest-site/xslt/fo document2fo.xsl
               src/resources/skins/forrest-site/xslt/html book2menu.xsl
                        document2html.xsl site2xhtml.xsl tab2menu.xsl
  Added:       src/resources/skins README
               src/resources/skins/forrest-site/images label.gif
                        menu-left.gif menu-right.gif search-left.gif
                        search-right.gif spacer.gif tab-left.gif
                        tab-right.gif tabSel-left.gif tabSel-right.gif
               src/resources/skins/forrest-site/scripts
                        breadcrumbs-optimized.js breadcrumbs.js
  Log:
  Synchronise changes from the new "bert" skin.
  
  Revision  Changes    Path
  1.1                  xml-forrest/src/resources/skins/README
  
  Index: README
  ===================================================================
  The "forrest-site" and "basic" skins are the only ones that are being
  maintained. If you want to add your own skin, then copy one of those, modify
  it to suit, and build with the use.skin="my-skin" parameter.
  
  The "bert" skin was a development version, which has now been merged with
  "forrest-site".
  
  
  
  1.3       +29 -54    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page.css	29 Jun 2002 19:03:15 -0000	1.2
  +++ page.css	30 Jul 2002 01:29:23 -0000	1.3
  @@ -1,49 +1,30 @@
  -body {  background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif}
  -form { margin: 0px; padding: 0px; border: 0px; }
  -ul,ol { margin: 10px 5px 10px 40px; padding: 0px; }
  -li { margin: 2px 0px 2px 0px; }
  -dl { margin: 10px 5px 10px 20px; padding: 0px; }
  -dt { font-weight: bold; margin: 5px 0px 0px 0px; }
  -table { border: 0px; width: 100%; }
  -td { font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif }
  -img { border: 0px; }
  -pre { padding: 10px 10px 10px 10px; margin-bottom: 0px }
  -
  -a:link { color: #0F3660 }
  -a:visited { color: #880000 }
  -a:active { font-weight: bold }
  -a:hover { color: #880000; }
  -
  -.path { font-size: 10px; background-color: #CFDCED; border-bottom-color: #4A6D8C; border-bottom-style: solid; border-bottom-width: 2px; padding: 2px; }
  -.path .current { font-weight: bold; }
  -
  -.top { background-color: #294563; }
  -.top img { margin: 5px; }
  -.topline { background-color: #4C6C8F; }
  -.navbar { background-color: #CFDCED; color: #4C6C8F; font-weight: bold; border-bottom-color: #4A6D8C; border-bottom-style: solid; border-bottom-width: 1px; padding: 2px;}
  -
  -.search { font-size: 13px; color: #ffffff; margin-right: 10px; padding: 10px 5px 3px 5px; background-color: #4A6D8C; }
  -
  -.tabs { font-size: 12px; background-color: #294563; padding: 2px 7px 5px 7px; }
  -.tabs .tab { background-color: #CFDCED; padding: 4px 6px 4px 6px;}
  -.tabs .current { background-color: #4C6C8F; font-weight: bold; padding: 5px 6px 6px 6px; ; color: #FFFFFF}
  -
  -.copyright { text-align: center; font-size: 10px; background-color: #CFDCED; border-top-color: #4A6D8C; border-top-style: solid; border-top-width: 1px; padding: 2px; }
  -
  -.menu { background-color: #4C6C8F; margin: 0px; padding: 3px 8px 5px 3px;}
  -.menu a:link { color: #FFFFFF }
  -.menu a:visited { color: #FFFFFF }
  -.menu a:active { font-weight: bold }
  -.menu a:hover { color: #880000; }
  +body {  background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-family: Arial, Helvetica, sans-serif;  font-size : 12px;  }
  +
  +a:link { color: #0F3660; }
  +a:visited { color: #009999; }
  +a:active { color: #000066; }
  +a:hover { color: #000066; }
  +
  +.menu { background-color: #4C6C8F; margin: 0px; padding: 3px 8px 5px 3px;  font-size : 12px;  }
  +.menu a:link { color: #FFFFFF;  text-decoration : none;  }
  +.menu a:visited { color: #FFFFFF; text-decoration : none; }
  +/*.menu a:active { font-weight: bold }*/
  +.menu a:hover { color: #FFCC00; text-decoration : none; }
   .menu ul { margin: 0px 0px 0px 20px; padding: 0px; }
  -.menu li .chapter  { list-style-image: url('images/chapter.gif'); font-weight: bold }
  -.menu li .open  { list-style-image: url('images/chapter_open.gif'); font-weight: bold }
  -.menu li .page  { list-style-image: url('images/page.gif') }
  -.menu li .current  { list-style-image: url('images/current.gif'); color: #FFD700; font-weight: bold; }
  +.menu li  { list-style-image: url('images/label.gif'); font-weight : bold; }
  +.menu ul ul li .sel { list-style-image: url('images/current.gif'); font-weight : normal; }
  +.menu ul ul li  { list-style-image: url('images/page.gif'); font-weight : normal; }
  +
  +table .title { background-color: #FFFFFF; width:100%; border: 0px; }
  +.dida { font-size: 9px; }
   
  -.content { padding: 5px 5px 5px 10px; }
  +.content { padding: 5px 5px 5px 10px;  font : small;  font-size : 12px;   }
  +.content .ForrestTable { width: 100%; background-color: #7099C5; color: #ffffff;  font-size : 12px;}
  +.content .ForrestTable .caption { text-align: left; color: black; font-size : 12px; }
  +.content .ForrestTable th { text-align: center;  font-size : 12px;}
  +.content .ForrestTable td { background-color: #f0f0ff; color: black;  font-size : 12px;}
   
  -.frame { margin: 5px 20px 5px 20px; font-size: 11px; }
  +.frame { margin: 5px 20px 5px 20px; font-size: 12px; }
   .frame .content { margin: 0px; }
   
   .note { border: solid 1px #7099C5; background-color: #f0f0ff; }
  @@ -56,18 +37,12 @@
   .fixme .label { background-color: #C6C600; color: #ffffff; }
   
   .code { border-color: #CFDCED; border-style: solid; border-width: 1px; }
  +.codefrag {	font-family: "Courier New", Courier, monospace; }
   
  -table.table { width: 100%; font-size: 11px; background-color: #7099C5; color: #ffffff; }
  -.table caption { text-align: left; font-weight: bold; color: black; }
  -.table th { text-align: center; font-weight: bold; }
  -.table td { background-color: #f0f0ff; color: black; }
  -
  -.dida { font-size: 9px; }
  -
  -.figure {}
  +.highlight { background-color: yellow; }
   
  -.icon {}
  +.minitoc {margin: 5px 5px 5px 40px;}
   
  -.highlight { background-color: yellow; }
  +.dtdElement { width: 100%;	font-size: 12px; background-color : #ffffff; }
   
  -.minitoc {font-size: 8pt; margin: 5px 5px 5px 40px;}
  \ No newline at end of file
  +.dtdTag {    color: #990000; text-transform : uppercase;  font-style : normal;  font-size : 15px;  font-weight : bold; }
  
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/label.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/menu-left.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/menu-right.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/search-left.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/search-right.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/spacer.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/tab-left.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/tab-right.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/tabSel-left.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/images/tabSel-right.gif
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/scripts/breadcrumbs-optimized.js
  
  Index: breadcrumbs-optimized.js
  ===================================================================
  var PREPREND_CRUMBS=new Array();
  PREPREND_CRUMBS.push(new Array("Apache","http://www.apache.org/"));
  PREPREND_CRUMBS.push(new Array("Jakarta","http://jakarta.apache.org/"));
  var DISPLAY_SEPARATOR=" &gt; ";
  var DISPLAY_PREPREND="";
  var DISPLAY_POSTPREND=":";
  var CSS_CLASS_CRUMB="breadcrumb";
  var CSS_CLASS_TRAIL="breadcrumbTrail";
  var CSS_CLASS_SEPARATOR="crumbSeparator";
  var FILE_EXTENSIONS=new Array( ".html", ".htm", ".jsp", ".php", ".php3", ".php4" );
  var PATH_SEPARATOR="/";
  
  function sc(s) {
  	var l=s.toLowerCase();
  	return l.substr(0,1).toUpperCase()+l.substr(1);
  }
  function getdirs() {
  	var t=document.location.pathname.split(PATH_SEPARATOR);
  	var lc=t[t.length-1];
  	for(var i=0;i < FILE_EXTENSIONS.length;i++)
  	{
  		if(lc.indexOf(FILE_EXTENSIONS[i]))
  			return t.slice(1,t.length-1); }
  	return t.slice(1,t.length);
  }
  function getcrumbs( d )
  {
  	var pre = "/";
  	var post = "/";
  	var c = new Array();
  	if( d != null )
  	{
  		for(var i=0;i < d.length;i++) {
  			pre+=d[i]+postfix;
  			c.push(new Array(d[i],pre)); }
  	}
  	if(PREPREND_CRUMBS.length > 0 )
  		return PREPREND_CRUMBS.concat( c );
  	return c;
  }
  function gettrail( c )
  {
  	var h=DISPLAY_PREPREND;
  	for(var i=0;i < c.length;i++)
  	{
  		h+='<a href="'+c[i][1]+'" >'+sc(c[i][0])+'</a>';
  		if(i!=(c.length-1))
  			h+=DISPLAY_SEPARATOR; }
  	return h+DISPLAY_POSTPREND;
  }
  
  function gettrailXHTML( c )
  {
  	var h='<span class="'+CSS_CLASS_TRAIL+'">'+DISPLAY_PREPREND;
  	for(var i=0;i < c.length;i++)
  	{
  		h+='<a href="'+c[i][1]+'" class="'+CSS_CLASS_CRUMB+'">'+sc(c[i][0])+'</a>';
  		if(i!=(c.length-1))
  			h+='<span class="'+CSS_CLASS_SEPARATOR+'">'+DISPLAY_SEPARATOR+'</span>'; }
  	return h+DISPLAY_POSTPREND+'</span>';
  }
  
  if(document.location.href.toLowerCase().indexOf("http://")==-1)
  	document.write(gettrail(getcrumbs()));
  else
  	document.write(gettrail(getcrumbs(getdirs())));
  
  
  
  
  1.1                  xml-forrest/src/resources/skins/forrest-site/scripts/breadcrumbs.js
  
  Index: breadcrumbs.js
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
      must not be used to endorse or promote products derived from this  software
      without  prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see <http://www.apache.org/>.
  
  */
  
  /**
   * This script, when included in a html file, builds a neat breadcrumb trail
   * based on its url. That is, if it doesn't contains bugs (I'm relatively
   * sure it does).
   *
   * Typical usage:
   * <script type="text/javascript" language="JavaScript" src="breadcrumbs.js"></script>
   *
   *@author     <a href="mailto:leosimons@apache.org">Leo Simons</a> (main author)
   *@author     <a href="mailto:nicolaken@apache.org">Nicola Ken Barozzi</a> (integration in skin)
   *@created    July 12, 2002
   *@version    1.0
   */
  
  /* ========================================================================
  	CONSTANTS
     ======================================================================== */
  
  /**
   * Two-dimensional array containing extra crumbs to place at the front of
   * the trail. Specify first the name of the crumb, then the URI that belongs
   * to it. You'll need to modify this for every domain or subdomain where
   * you use this script (you can leave it as an empty array if you wish)
   */
  var PREPREND_CRUMBS = new Array();
     if(!("@link1@"=="")){
       PREPREND_CRUMBS.push( new Array( "@link1@", "@link1.href@" ) );
     }
     if(!("@link2@"=="")){
       PREPREND_CRUMBS.push( new Array( "@link2@", "@link2.href@" ) );
     }
     if(!("@link3@"=="")){
       PREPREND_CRUMBS.push( new Array( "@link3@", "@link3.href@" ) );
     }
  
  /**
   * String to include between crumbs:
   */
  var DISPLAY_SEPARATOR = " &gt; ";
  /**
   * String to include at the beginning of the trail
   */
  var DISPLAY_PREPREND = "";
  /**
   * String to include at the end of the trail
   */
  var DISPLAY_POSTPREND = "";
  
  /**
   * CSS Class to use for a single crumb:
   */
  var CSS_CLASS_CRUMB = "breadcrumb";
  
  /**
   * CSS Class to use for the complete trail:
   */
  var CSS_CLASS_TRAIL = "breadcrumbTrail";
  
  /**
   * CSS Class to use for crumb separator:
   */
  var CSS_CLASS_SEPARATOR = "crumbSeparator";
  
  /**
   * Array of strings containing common file extensions. We use this to
   * determine what part of the url to ignore (if it contains one of the
   * string specified here, we ignore it).
   */
  var FILE_EXTENSIONS = new Array( ".html", ".htm", ".jsp", ".php", ".php3", ".php4" );
  
  /**
   * String that separates parts of the breadcrumb trail from each other.
   * When this is no longer a slash, I'm sure I'll be old and grey.
   */
  var PATH_SEPARATOR = "/";
  
  /* ========================================================================
  	UTILITY FUNCTIONS
     ======================================================================== */
  /**
   * Capitalize first letter of the provided string and return the modified
   * string.
   */
  function sentenceCase( string )
  {
  	var lower = string.toLowerCase();
  	return lower.substr(0,1).toUpperCase() + lower.substr(1);
  }
  
  /**
   * Returns an array containing the names of all the directories in the
   * current document URL
   */
  function getDirectoriesInURL()
  {
  	var trail = document.location.pathname.split( PATH_SEPARATOR );
  
  	// check whether last section is a file or a directory
  	var lastcrumb = trail[trail.length-1];
  	for( var i = 0; i < FILE_EXTENSIONS.length; i++ )
  	{
  		if( lastcrumb.indexOf( FILE_EXTENSIONS[i] ) )
  		{
  			// it is, remove it and send results
  			return trail.slice( 1, trail.length-1 );
  		}
  	}
  
  	// it's not; send the trail unmodified
  	return trail.slice( 1, trail.length );
  }
  
  /* ========================================================================
  	BREADCRUMB FUNCTIONALITY
     ======================================================================== */
  /**
   * Return a two-dimensional array describing the breadcrumbs based on the
   * array of directories passed in.
   */
  function getBreadcrumbs( dirs )
  {
  	var prefix = "/";
  	var postfix = "/";
  
  	// the array we will return
  	var crumbs = new Array();
  
  	if( dirs != null )
  	{
  		for( var i = 0; i < dirs.length; i++ )
  		{
  			prefix += dirs[i] + postfix;
  			crumbs.push( new Array( dirs[i], prefix ) );
  		}
  	}
  
  	// preprend the PREPREND_CRUMBS
  	if(PREPREND_CRUMBS.length > 0 )
  	{
  		return PREPREND_CRUMBS.concat( crumbs );
  	}
  
  	return crumbs;
  }
  
  /**
   * Return a string containing a simple text breadcrumb trail based on the
   * two-dimensional array passed in.
   */
  function getCrumbTrail( crumbs )
  {
  	var xhtml = DISPLAY_PREPREND;
  
  	for( var i = 0; i < crumbs.length; i++ )
  	{
  		xhtml += '<a href="' + crumbs[i][1] + '" >';
  		xhtml += sentenceCase( crumbs[i][0] ) + '</a>';
  		if( i != (crumbs.length-1) )
  		{
  			xhtml += DISPLAY_SEPARATOR;
  		}
  	}
  
  	xhtml += DISPLAY_POSTPREND;
  
  	return xhtml;
  }
  
  /**
   * Return a string containing an XHTML breadcrumb trail based on the
   * two-dimensional array passed in.
   */
  function getCrumbTrailXHTML( crumbs )
  {
  	var xhtml = '<span class="' + CSS_CLASS_TRAIL  + '">';
  	xhtml += DISPLAY_PREPREND;
  
  	for( var i = 0; i < crumbs.length; i++ )
  	{
  		xhtml += '<a href="' + crumbs[i][1] + '" class="' + CSS_CLASS_CRUMB + '">';
  		xhtml += sentenceCase( crumbs[i][0] ) + '</a>';
  		if( i != (crumbs.length-1) )
  		{
  			xhtml += '<span class="' + CSS_CLASS_SEPARATOR + '">' + DISPLAY_SEPARATOR + '</span>';
  		}
  	}
  
  	xhtml += DISPLAY_POSTPREND;
  	xhtml += '</span>';
  
  	return xhtml;
  }
  
  /* ========================================================================
  	PRINT BREADCRUMB TRAIL
     ======================================================================== */
  
  // check if we're local; if so, only print the PREPREND_CRUMBS
  if( document.location.href.toLowerCase().indexOf( "http://" ) == -1 )
  {
  	document.write( getCrumbTrail( getBreadcrumbs() ) );
  }
  else
  {
  	document.write( getCrumbTrail( getBreadcrumbs( getDirectoriesInURL() ) ) );
  }
  
  
  
  
  1.2       +477 -260  xml-forrest/src/resources/skins/forrest-site/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/fo/document2fo.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document2fo.xsl	8 Jun 2002 13:37:17 -0000	1.1
  +++ document2fo.xsl	30 Jul 2002 01:29:23 -0000	1.2
  @@ -5,284 +5,343 @@
                   version="1.0">
   
     <xsl:output method="xml"/>
  -  
  +
     <xsl:template match="/">
       <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
  -   
  -    <fo:layout-master-set>
  -        <fo:simple-page-master master-name="title"
  -                               page-height="11in"
  -                               page-width="8.5in"
  -                               margin-top="1in"
  -                               margin-bottom="1in"
  -                               margin-left="1.25in"
  -                               margin-right="1.5in">
  -          <fo:region-before extent=".5in" region-name="title-header"/>
  -          <fo:region-body margin-top="1in" margin-bottom="1in"/>
  -          <fo:region-after extent=".5in" region-name="title-footer"/>
  -        </fo:simple-page-master>
  +      <fo:layout-master-set>
   
  -        <fo:simple-page-master master-name="inside"
  -                               page-height="11in"
  -                               page-width="8.5in"
  -                               margin-top="1in"
  -                               margin-bottom="1in"
  -                               margin-left="1.5in"
  -                               margin-right="1.25in">
  -          <fo:region-before extent=".5in" region-name="inside-header"/>
  -          <fo:region-body margin-top="1in" margin-bottom="1in"/>
  -          <fo:region-after extent=".5in" region-name="inside-footer"/>
  +        <fo:simple-page-master master-name="first-page"
  +          page-height="11in" 
  +          page-width="8.5in"
  +          margin-top="1in" 
  +          margin-bottom="1in" 
  +          margin-left="1.25in" 
  +          margin-right="1in">
  +          <fo:region-body
  +            margin-top="0.5in"
  +            margin-bottom=".5in"/>
  +          <fo:region-after 
  +            region-name="first-footer"
  +            extent=".5in"
  +            display-align="before"/>
           </fo:simple-page-master>
   
           <fo:simple-page-master master-name="even-page"
  -                               page-height="11in" 
  -                               page-width="8.5in"
  -                               margin-top="1in" 
  -                               margin-bottom="1in" 
  -                               margin-left="1.25in" 
  -                               margin-right="1in">
  -          <fo:region-before extent=".5in" region-name="even-header"/>
  -          <fo:region-body margin-top=".5in" margin-bottom=".5in"/>
  -          <fo:region-after extent=".5in" region-name="even-footer"/>
  +          page-height="11in" 
  +          page-width="8.5in"
  +          margin-top="1in" 
  +          margin-bottom="1in" 
  +          margin-left="1.25in" 
  +          margin-right="1in">
  +          <fo:region-before
  +            region-name="even-header"
  +            extent="0.5in"
  +            border-bottom="0.5pt solid"/>
  +          <fo:region-body
  +            margin-top="0.5in"
  +            margin-bottom=".5in"/>
  +          <fo:region-after 
  +            region-name="even-footer"
  +            extent=".5in"
  +            display-align="before"/>
           </fo:simple-page-master>
   
           <fo:simple-page-master master-name="odd-page"
  -                               page-height="11in"
  -                               page-width="8.5in"
  -                               margin-top="1in"
  -                               margin-bottom="1in"
  -                               margin-left="1in"
  -                               margin-right="1.25in">
  -          <fo:region-before extent=".5in" region-name="odd-header"/>
  -          <fo:region-body margin-top=".5in" margin-bottom=".5in"/>
  -          <fo:region-after extent=".5in" region-name="odd-footer"/>
  +          page-height="11in" 
  +          page-width="8.5in"
  +          margin-top="1in" 
  +          margin-bottom="1in" 
  +          margin-left="1.25in" 
  +          margin-right="1in">
  +          <fo:region-before
  +            region-name="odd-header"
  +            extent="0.5in"
  +            border-bottom="0.5pt solid"/>
  +          <fo:region-body
  +            margin-top="0.5in"
  +            margin-bottom=".5in"/>
  +          <fo:region-after 
  +            region-name="odd-footer"
  +            extent=".5in"
  +            display-align="before"/>
           </fo:simple-page-master>
   
  -        <fo:page-sequence-master master-name="chapter">
  +        <fo:page-sequence-master master-name="book">
             <fo:repeatable-page-master-alternatives>
  -            <fo:conditional-page-master-reference master-name="title"
  -                                                  page-position="first"
  -                                                  odd-or-even="odd"/>
  -            <fo:conditional-page-master-reference master-name="odd-page"
  -                                                  odd-or-even="odd"
  -                                                  blank-or-not-blank="not-blank"/>
  -            <fo:conditional-page-master-reference master-name="even-page"
  -                                                  page-position="last"/>
  -            <fo:conditional-page-master-reference master-name="even-page"
  -                                                  odd-or-even="even"/>
  +            <fo:conditional-page-master-reference
  +              page-position="first"
  +              master-reference="first-page"/>
  +            <fo:conditional-page-master-reference
  +              odd-or-even="odd"
  +              master-reference="odd-page"/>
  +            <fo:conditional-page-master-reference
  +              odd-or-even="even"
  +              master-reference="even-page"/>
             </fo:repeatable-page-master-alternatives>
           </fo:page-sequence-master>
         </fo:layout-master-set>
  -
  -      <fo:page-sequence master-name="title">
  -        <xsl:if test="//authors">
  -          <fo:static-content flow-name="title-footer">
  -            <fo:block font-family="serif"
  -                      font-size="16pt"
  -                      font-style="italic"
  -                      text-align="end">
  -              <xsl:for-each select="//authors/person">
  -                <xsl:value-of select="@name"/>
  -              </xsl:for-each>
  -            </fo:block>
  -          </fo:static-content>
  -        </xsl:if>
  -        <fo:flow flow-name="xsl-region-body">
  -          <fo:block font-family="serif"
  -                    font-size="48pt"
  -                    font-weight="bold">
  -            <xsl:value-of select="//title"/>
  -          </fo:block>
  -          <xsl:if test="//subtitle">
  -            <fo:block font-family="serif"
  -                      font-size="24pt"
  -                      border-top-style="solid"
  -                      border-top-width=".5pt"
  -                      space-before="12pt"
  -                      text-align="end">
  -              <xsl:value-of select="//subtitle"/>
  -            </fo:block>
  -          </xsl:if>
  -        </fo:flow>
  +      
  +      <fo:page-sequence master-reference="book">
  +        <xsl:apply-templates/>
         </fo:page-sequence>
  -      <xsl:apply-templates/>
  -      <xsl:call-template name="authors"/>
  +      
       </fo:root>
     </xsl:template>
  -
  +  
     <xsl:template match="document">
  -    <fo:page-sequence force-page-count="end-on-even" master-name="chapter">
  -      <fo:title><xsl:value-of select="header/title"/></fo:title>
  -      <fo:static-content flow-name="even-header">
  -        <fo:block text-align="start"
  -                  line-height="12pt"
  -                  font-style="italic"
  -                  font-family="serif"
  -                  font-size="10pt"
  -                  border-after-style="solid"
  -                  border-after-width=".5pt">
  -          <xsl:value-of select="header/title"/>
  -        </fo:block>
  -      </fo:static-content>
  -      <fo:static-content flow-name="even-footer">
  -        <fo:block text-align="start"
  -                  line-height="12pt"
  -                  border-before-style="solid"
  -                  border-before-width=".5pt"
  -                  font-family="serif"
  -                  font-size="10pt"><fo:page-number/></fo:block>
  -      </fo:static-content>
  -      <fo:static-content flow-name="odd-header">
  -        <fo:block text-align="end"
  -                  line-height="12pt"
  -                  font-style="italic"
  -                  font-family="serif"
  -                  font-size="10pt"
  -                  border-after-style="solid"
  -                  border-after-width=".5pt">
  -          <xsl:value-of select="title"/>
  -        </fo:block>
  -      </fo:static-content>
  -      <fo:static-content flow-name="odd-footer">
  -        <fo:block text-align="end"
  -                  line-height="12pt"
  -                  border-before-style="solid"
  -                  border-before-width=".5pt"
  -                  font-family="serif"
  -                  font-size="10pt"><fo:page-number/></fo:block>
  -      </fo:static-content>
  -      <fo:static-content flow-name="title-footer">
  -        <fo:block text-align="end"
  -                  line-height="12pt"
  -                  border-before-style="solid"
  -                  border-before-width=".5pt"
  -                  font-family="serif"
  -                  font-size="10pt"><fo:page-number/></fo:block>
  -      </fo:static-content>
  -      <fo:flow flow-name="xsl-region-body">
  -        <fo:block space-before="2in" font-family="serif" font-size="24pt" font-weight="bold">
  -          <xsl:value-of select="title"/>
  -        </fo:block>
  -        <xsl:if test="header/subtitle">
  -          <fo:block font-style="italic"
  -                    font-family="serif"
  -                    font-size="18pt"
  -                    space-after="10pt">
  -            <xsl:value-of select="header/subtitle"/>
  -          </fo:block>
  -        </xsl:if>
  -        <xsl:apply-templates/>
  -        <xsl:apply-templates select="//authors"/>
  -      </fo:flow>
  -    </fo:page-sequence>
  -  </xsl:template>
  +    <fo:title><xsl:value-of select="header/title"/></fo:title>
  +    
  +    <fo:static-content flow-name="first-footer">
  +      <fo:block
  +        border-top="0.25pt solid"
  +        padding-before="6pt"
  +        text-align="center">
  +        <xsl:apply-templates select="footer"/>
  +      </fo:block>
  +      <fo:block
  +        text-align="start">
  +        Page <fo:page-number/>
  +      </fo:block>
  +    </fo:static-content>
   
  -  <xsl:template match="header">
  -    <fo:page-sequence master-name="inside">
  -      <fo:flow flow-name="xsl-region-body">
  -        <fo:block font-weight="bold" font-size="14pt">
  -          <xsl:value-of select="title"/>
  -        </fo:block>
  -        <xsl:if test="subtitle">
  -          <fo:block font-weight="bold" font-size="10pt">
  -            <xsl:value-of select="subtitle"/>
  -          </fo:block>
  -        </xsl:if>
  -        <xsl:if test="authors">
  -          <fo:block font-size="10pt">
  -            <xsl:text>by </xsl:text>
  -            <xsl:for-each select="authors/person">
  -              <xsl:if test="not(position()=1)">
  -                <xsl:text>, </xsl:text>
  -              </xsl:if>
  -              <xsl:value-of select="name"/>
  -            </xsl:for-each>
  -          </fo:block>
  -        </xsl:if>
  -        <xsl:apply-templates select="abstract"/>
  -      </fo:flow>
  -    </fo:page-sequence>
  -  </xsl:template>
  +    <fo:static-content flow-name="even-header">
  +      <fo:block
  +        text-align="end"
  +        font-style="italic">
  +        <xsl:value-of select="header/title"/>
  +      </fo:block>
  +    </fo:static-content>
  +
  +    <fo:static-content flow-name="even-footer">
  +      <fo:block
  +        border-top="0.25pt solid"
  +        padding-before="6pt"
  +        text-align="center">
  +        <xsl:apply-templates select="footer"/>
  +      </fo:block>
  +      <fo:block
  +        text-align="end">
  +        Page <fo:page-number/>
  +      </fo:block>
  +    </fo:static-content>
  +
  +    <fo:static-content flow-name="odd-header">
  +      <fo:block
  +        text-align="start"
  +        font-style="italic">
  +        <xsl:value-of select="header/title"/>
  +      </fo:block>
  +    </fo:static-content>
  +    
  +    <fo:static-content flow-name="odd-footer">
  +      <fo:block
  +        border-top="0.25pt solid"
  +        padding-before="6pt"
  +        text-align="center">
  +        <xsl:apply-templates select="footer"/>
  +      </fo:block>
  +      <fo:block
  +        text-align="start">
  +        Page <fo:page-number/>
  +      </fo:block>
  +    </fo:static-content>
   
  +    <fo:flow flow-name="xsl-region-body">
  +      <fo:block
  +        padding-before="24pt"
  +        padding-after="24pt"
  +        font-size="24pt"
  +        font-weight="bold">
  +        <xsl:value-of select="header/title"/>
  +      </fo:block>
  +      
  +      <fo:block
  +        text-align="justify"
  +        padding-before="18pt"
  +        padding-after="18pt">
  +        <xsl:apply-templates/>
  +      </fo:block>
  +    </fo:flow>
  +  </xsl:template>
  +  
     <xsl:template match="abstract">
  -    <fo:block font-size="8pt"
  -              text-align="justify"
  -              space-before="20pt"
  -              width="7.5in"
  -              font-family="serif">
  +    <fo:block
  +      font-size="12pt"
  +      text-align="center"
  +      space-before="20pt"
  +      space-after="25pt"
  +      width="7.5in"
  +      font-family="serif"
  +      font-style="italic">
         <xsl:apply-templates/>
       </fo:block>
     </xsl:template>
  +  
  +  <xsl:template match="notice">
  +    <fo:block
  +      font-size="10pt"
  +      text-align="left"
  +      space-before="20pt"
  +      width="7.5in"
  +      font-family="serif"
  +      border-top="0.25pt solid"
  +      border-bottom="0.25pt solid"
  +      padding-before="6pt"
  +      padding-after="6pt">
  +      NOTICE: <xsl:apply-templates/>
  +    </fo:block>
  +  </xsl:template>
   
     <xsl:template match="section">
  +    
       <xsl:param name="level">0</xsl:param>
       <xsl:variable name="size" select="16-(number($level)*2)"/>
  -
  -    <fo:block font-family="serif"
  -              font-size="{$size}pt"
  -              font-weight="bold"
  -              space-before="12pt">
  +    
  +    <fo:block
  +      font-family="serif"
  +      font-size="{$size}pt"
  +      font-weight="bold"
  +      space-before="12pt">
  +      <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
  +      <xsl:text> </xsl:text>
         <xsl:value-of select="title"/>
       </fo:block>
       <xsl:apply-templates>
         <xsl:with-param name="level" select="number($level)+1"/>
       </xsl:apply-templates>
  +    
  +  </xsl:template>
  +  
  +  <xsl:template match="title">
  +    <!-- do nothing as titles are handled in their parent templates -->
  +  </xsl:template>
  +  
  +  <xsl:template match="subtitle">
  +    <xsl:param name="level">0</xsl:param>
  +    <xsl:variable name="size" select="16-(number($level)*1.5)"/>
  +
  +    <fo:block
  +      font-weight="bold"
  +      font-size="{$size}pt">
  +      <xsl:apply-templates/>
  +    </fo:block>
  +  </xsl:template>
  +
  +  <xsl:template match="authors">
  +    <fo:block
  +      space-before="20pt"
  +      font-weight="bold"
  +      font-size="9pt">
  +      <xsl:for-each select="person">
  +        <xsl:value-of select="@name"/>, <xsl:value-of select="@email"/>
  +        <xsl:if test="not(position() = last())">, </xsl:if>
  +      </xsl:for-each>
  +    </fo:block>
     </xsl:template>
   
     <xsl:template match="p">
  -    <fo:block space-after="8pt"
  -              font-family="serif"><xsl:apply-templates/></fo:block>
  +    <fo:block
  +      space-before="4pt"
  +      space-after="4pt"
  +      font-family="serif">
  +      <xsl:apply-templates/>
  +    </fo:block>
     </xsl:template>
  +  
   
     <xsl:template match="source">
  -    <fo:block font-family="monospace"
  -              font-size="10pt"
  -              background-color="#f0f0f0"
  -              white-space-collapse="false"
  -              keep-together="always">
  -       <xsl:apply-templates/>
  +    <fo:block
  +      font-family="monospace"
  +      font-size="10pt"
  +      background-color="#f0f0f0"
  +      white-space-collapse="false"
  +      text-align="start">
  +      <xsl:apply-templates/>
       </fo:block>
     </xsl:template>
  -
  +  
  +  
     <xsl:template match="ol|ul">
  -    <fo:list-block provisional-distance-between-starts="9mm"
  -                   provisional-label-separation="3mm">
  +    <fo:list-block 
  +      provisional-distance-between-starts="18pt"
  +      provisional-label-separation="3pt"
  +      text-align="start">
         <xsl:apply-templates/>
       </fo:list-block>
     </xsl:template>
  -
  +  
     <xsl:template match="ol/li">
       <fo:list-item>
  -      <fo:list-item-label start-indent="50%" end-indent="label-end()">
  +      <fo:list-item-label 
  +        end-indent="label-end()">
           <fo:block>
             <xsl:number format="1."/>
           </fo:block>
         </fo:list-item-label>
  -      <fo:list-item-body start-indent="body-start()">
  -        <fo:block>
  +      <fo:list-item-body 
  +        start-indent="body-start()">
  +        <fo:block
  +          font-family="serif">
             <xsl:apply-templates/>
           </fo:block>
         </fo:list-item-body>
       </fo:list-item>
     </xsl:template>
  -
  +  
     <xsl:template match="ul/li">
       <fo:list-item>
  -      <fo:list-item-label start-indent="50%" end-indent="label-end()">
  +      <fo:list-item-label end-indent="label-end()">
           <fo:block>&#x2022;</fo:block>
         </fo:list-item-label>
         <fo:list-item-body start-indent="body-start()">
  +        <fo:block
  +          font-family="serif">
  +          <xsl:apply-templates/>
  +        </fo:block>
  +      </fo:list-item-body>
  +    </fo:list-item>
  +  </xsl:template>
  +  
  +  <xsl:template match="dl">
  +    <fo:list-block
  +      provisional-distance-between-starts="18pt"
  +      provisional-label-separation="3pt"
  +      text-align="start">
  +      <xsl:apply-templates/>
  +    </fo:list-block>
  +  </xsl:template>
  +  
  +  <xsl:template match="dt">
  +    <fo:list-item>
  +      <fo:list-item-label end-indent="label-end()">
  +        <fo:block></fo:block>
  +      </fo:list-item-label>
  +      <fo:list-item-body start-indent="body-start()">
  +        <fo:block
  +          font-weight="bold">
  +          <xsl:apply-templates/>
  +        </fo:block>
  +      </fo:list-item-body>
  +    </fo:list-item>
  +  </xsl:template>
  +  
  +  <xsl:template match="dd">
  +    <fo:list-item>
  +      <fo:list-item-label end-indent="label-end()">
  +        <fo:block></fo:block>
  +      </fo:list-item-label>
  +      <fo:list-item-body start-indent="body-start()">
           <fo:block>
             <xsl:apply-templates/>
           </fo:block>
         </fo:list-item-body>
       </fo:list-item>
     </xsl:template>
  -
  +  
     <xsl:template match="strong">
       <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
     </xsl:template>
  -
  +  
     <xsl:template match="em">
       <fo:inline font-style="italic"><xsl:apply-templates/></fo:inline>
     </xsl:template>
  @@ -292,87 +351,245 @@
     </xsl:template>
   
     <xsl:template match="warning">
  -    <fo:block margin-left="1in"
  -              margin-right="1in"
  -              font-weight="bold"
  -              font-size="10pt"
  -              font-family="serif"
  -              space-before="10pt"
  -              border-before-style="solid"
  -              border-start-style="solid"
  -              border-end-style="solid"
  -              background-color="#800000"
  -              color="#ffffff">
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-weight="bold"
  +      font-size="10pt"
  +      font-family="serif"
  +      space-before="10pt"
  +      border-before-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#D00000"
  +      background-color="#D00000"
  +      color="#ffffff">
         Warning: <xsl:value-of select="title"/>
       </fo:block>
  -    <fo:block margin-left="1in"
  -              margin-right="1in"
  -              font-family="serif"
  -              font-size="8pt"
  -              border-after-style="solid"
  -              border-start-style="solid"
  -              border-end-style="solid"
  -              background-color="#f0f0f0"
  -              padding-start="3pt"
  -              padding-end="3pt"
  -              padding-before="3pt"
  -              padding-after="3pt">
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-family="serif"
  +      font-size="8pt"
  +      border-after-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#D00000"
  +      background-color="#fff0f0"
  +      padding-start="3pt"
  +      padding-end="3pt"
  +      padding-before="3pt"
  +      padding-after="3pt"
  +      space-after="10pt">
         <xsl:apply-templates/>
       </fo:block>
     </xsl:template>
   
  -  <xsl:template match="link">
  -    <fo:basic-link external-destination="{@uri}"><xsl:apply-templates/></fo:basic-link>
  +  <xsl:template match="note">
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-weight="bold"
  +      font-size="10pt"
  +      color="#ffffff"
  +      font-family="serif"
  +      space-before="10pt"
  +      border-before-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#A0C9F5"
  +      background-color="#A0C9F5">
  +      Note: <xsl:value-of select="title"/>
  +    </fo:block>
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-family="serif"
  +      font-size="8pt"
  +      space-after="10pt"
  +      border-after-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#A0C9F5"
  +      background-color="#F0F0FF"
  +      padding-start="3pt"
  +      padding-end="3pt"
  +      padding-before="3pt"
  +      padding-after="3pt">
  +      <xsl:apply-templates/>
  +    </fo:block>
     </xsl:template>
   
  -  <xsl:template match="figure">
  -    <fo:block text-align="center" font-weight="bold" font-family="serif" space-before="10pt" space-after="20pt">
  -      <xsl:value-of select="title"/>
  +  <xsl:template match="fixme">
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-weight="bold"
  +      font-size="10pt"
  +      color="#FFFFFF"
  +      font-family="serif"
  +      space-before="10pt"
  +      border-before-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#C6C650"
  +      background-color="#C6C650">
  +      FIXME (<xsl:value-of select="@author"/>): <xsl:value-of select="title"/>
  +    </fo:block>
  +    <fo:block
  +      margin-left="0.25in"
  +      margin-right="0.25in"
  +      font-family="serif"
  +      font-size="8pt"
  +      space-after="10pt"
  +      border-after-style="solid"
  +      border-start-style="solid"
  +      border-end-style="solid"
  +      border-color="#C6C650"
  +      background-color="#FFF0F0"
  +      padding-start="3pt"
  +      padding-end="3pt"
  +      padding-before="3pt"
  +      padding-after="3pt">
         <xsl:apply-templates/>
       </fo:block>
     </xsl:template>
   
  -  <xsl:template match="graphic">
  -    <fo:external-graphic src="build/documentation/resources/{@fileref}">
  -      <xsl:attribute name="content-type">
  -        <xsl:text>content-type:image/</xsl:text>
  -        <xsl:value-of select="translate(@format,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>
  -      </xsl:attribute>
  -    </fo:external-graphic>
  -    <xsl:if test="@srccredit">
  -      <fo:block font-size="8pt" font-family="serif" font-style="italic">
  -        &#x2022; <xsl:value-of select="@srccredit"/>
  +  <xsl:template match="link">
  +    <fo:basic-link external-destination="{@href}"><xsl:apply-templates/></fo:basic-link>
  +  </xsl:template>
  +
  +  <xsl:template match="figure">
  +    <!-- FIXME: Images are not found at the moment -->
  +    <fo:external-graphic src="{@src}"/>
  +    <!-- alt text and credits need inserting -->
  +  </xsl:template>
  +
  +  <xsl:template match="table">
  +    <!-- FIXME: Apache FOP must have column widths specified at present,
  +         this section can be removed when this limitation is removed from Fop. 
  +         Unfortunately, this means that each column is a fixed width,
  +         but at least the table displays! -->
  +
  +    <xsl:variable name="max-number-columns">
  +      <xsl:for-each select="tr">
  +        <xsl:sort select="count(td|th)" data-type="number" order="descending"/>
  +        <xsl:if test="position() = 1">
  +          <xsl:value-of select="count(td|th)"/>
  +        </xsl:if>
  +      </xsl:for-each>
  +    </xsl:variable>
  +
  +
  +    <xsl:variable name="column-width">
  +      <xsl:value-of select="6.25 div number($max-number-columns)"/>in
  +    </xsl:variable>
  +
  +    <fo:table>
  +                  
  +      <fo:table-column>
  +        <xsl:attribute name="column-width">
  +          <xsl:value-of select="$column-width"/>
  +        </xsl:attribute>
  +
  +        <xsl:attribute name="number-columns-repeated">
  +          <xsl:value-of select="number($max-number-columns)"/>
  +        </xsl:attribute>
  +      </fo:table-column>
  +
  +      <!-- End of hack for Fop support (if removing this hack, remember 
  +           you need the <fo:table> element) -->
  +
  +      <fo:table-body
  +        font-size="10pt"
  +        font-family="sans-serif">
  +        <xsl:apply-templates select="tr"/>
  +      </fo:table-body>
  +    </fo:table>
  +
  +    <!-- FIXME: Apache Fop does not support the caption element yet.
  +         This hack will display the table caption accordingly. -->
  +    <xsl:if test="caption">
  +      <fo:block
  +        text-align="center"
  +        font-weight="bold">
  +        Table
  +        <xsl:text> </xsl:text>
  +        <xsl:number count="table" level="multiple"/>
  +        <xsl:text>: </xsl:text>
  +        <xsl:value-of select="caption"/>
         </fo:block>
       </xsl:if>
     </xsl:template>
   
  -  <xsl:template match="table">
  -    <fo:table width="100%" table-layout="fixed">
  +  <xsl:template match="tr">
  +    <fo:table-row>
         <xsl:apply-templates/>
  -    </fo:table>
  +    </fo:table-row>
     </xsl:template>
   
     <xsl:template match="th">
  -    <fo:table-header>
  -      <xsl:apply-templates/>
  -    </fo:table-header>
  +      <fo:table-cell
  +        padding-before="4pt"
  +        padding-after="4pt"
  +        padding-start="4pt"
  +        padding-end="4pt"
  +        background-color="#A0C9F5">
  +        <xsl:attribute name="number-columns-spanned">
  +          <xsl:value-of select="@colspan"/>
  +        </xsl:attribute>
  +        <xsl:attribute name="number-rows-spanned">
  +          <xsl:value-of select="@rowspan"/>
  +        </xsl:attribute>
  +        <fo:block
  +          text-align="center">
  +          <xsl:apply-templates/>
  +        </fo:block>
  +      </fo:table-cell>
     </xsl:template>
   
  -  <xsl:template match="tr">
  -    <fo:table-row><xsl:apply-templates/></fo:table-row>
  +  <xsl:template match="td">
  +    <fo:table-cell
  +      padding-before="4pt"
  +      padding-after="4pt"
  +      padding-start="4pt"
  +      padding-end="4pt"
  +      border="1pt solid #A0C9F5">
  +      <xsl:attribute name="number-columns-spanned">
  +          <xsl:value-of select="@colspan"/>
  +        </xsl:attribute>
  +        <xsl:attribute name="number-rows-spanned">
  +          <xsl:value-of select="@rowspan"/>
  +        </xsl:attribute>
  +      <fo:block>
  +        <xsl:apply-templates/>
  +      </fo:block>
  +    </fo:table-cell>
     </xsl:template>
   
  -  <xsl:template match="tbody">
  -    <fo:table-body>
  -      <xsl:apply-templates/>
  -    </fo:table-body>
  +  <xsl:template match="br">
  +    <fo:block></fo:block>
     </xsl:template>
   
  -  <xsl:template match="td">
  -    <fo:table-cell>
  +  <xsl:template match="legal">
  +    <fo:inline
  +      font-size="8pt">
         <xsl:apply-templates/>
  -    </fo:table-cell>
  +    </fo:inline>
     </xsl:template>
   
  +<!-- ====================================================================== -->
  +<!-- Local Extensions section -->
  +<!-- ====================================================================== -->
  +
  + <xsl:template match="citation">
  +   <fo:inline>
  +     [<xsl:value-of select="@def"/>]
  +   </fo:inline>
  + </xsl:template>
  +
  +
  +
   </xsl:stylesheet>
  +
   
  
  
  
  1.2       +43 -33    xml-forrest/src/resources/skins/forrest-site/xslt/html/book2menu.xsl
  
  Index: book2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/book2menu.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- book2menu.xsl	29 May 2002 16:44:55 -0000	1.1
  +++ book2menu.xsl	30 Jul 2002 01:29:23 -0000	1.2
  @@ -1,35 +1,45 @@
  -<?xml version='1.0'?>
  +<?xml version="1.0"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  -   <xsl:template match="book">
  -      <div class="menu">
  -         <ul>
  -            <xsl:apply-templates select="menu" />
  -         </ul>
  -      </div>
  -   </xsl:template>
  -
  -   <xsl:template match="menu">
  -      <li>
  -         <xsl:value-of select="@label" />
  -
  -         <xsl:if test="menu-item | external">
  -            <ul>
  -               <xsl:apply-templates select="menu-item | external" />
  -            </ul>
  -         </xsl:if>
  -      </li>
  -   </xsl:template>
  -
  -   <xsl:template match="menu-item[@type='hidden']" />
  -
  -   <xsl:template match="external[@type='hidden']" />
  -
  -   <xsl:template match="menu-item | external">
  -      <li>
  -         <a href="{@href}">
  -            <xsl:value-of select="@label" />
  -         </a>
  -      </li>
  -   </xsl:template>
  +  <xsl:param name="resource"/>
  +  <xsl:template match="book">
  +    <div class="menu">
  +      <ul>
  +        <xsl:apply-templates select="menu"/>
  +      </ul>
  +    </div>
  +  </xsl:template>
  +  <xsl:template match="menu">
  +    <li>
  +      <font color="white"><xsl:value-of select="@label"/></font>
  +      <ul>
  +        <xsl:apply-templates/>
  +      </ul>
  +    </li>
  +  </xsl:template>
  +  <xsl:template match="menu-item">
  +    <li>
  +       <xsl:choose>
  +         <xsl:when test="starts-with(@href, $resource)">
  +          <span class="sel"><font color="#ffcc00"><xsl:value-of select="@label"/></font></span>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <a href="{@href}"><xsl:value-of select="@label"/></a>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </li>
  +  </xsl:template>
  +  <xsl:template match="external">
  +    <li>
  +       <xsl:choose>
  +         <xsl:when test="starts-with(@href, $resource)">
  +          <font color="#ffcc00"><xsl:value-of select="@label"/></font>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <a href="{@href}" target="_blank"><xsl:value-of select="@label"/></a>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </li>
  +  </xsl:template>
  +  <xsl:template match="menu-item[@type='hidden']"/>
  +  <xsl:template match="external[@type='hidden']"/>
   </xsl:stylesheet>
  -
  
  
  
  1.6       +28 -7     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- document2html.xsl	18 Jun 2002 06:35:13 -0000	1.5
  +++ document2html.xsl	30 Jul 2002 01:29:23 -0000	1.6
  @@ -1,12 +1,25 @@
   <?xml version="1.0"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:param name="isfaq"/>
  +  <xsl:param name="resource"/>
     <xsl:template match="document">
  -    <td colspan="2" valign="top" class="content">
  +    <div class="content">
         <xsl:if test="normalize-space(header/title)!=''">
  -        <h1>
  -          <xsl:value-of select="header/title"/>
  -        </h1>
  +        <table class="title">
  +          <tr> 
  +            <td valign="middle"> 
  +              <h1>
  +                <xsl:value-of select="header/title"/>
  +              </h1>
  +            </td>
  +            <!--td align="center" width="80" nowrap><a href="" class="dida"><img src="images/singlepage.gif"><br>
  +              single page<br>
  +              version</a></td-->
  +            <td align="center" width="80" nowrap="nowrap"><a href="{$resource}.pdf" class="dida"><img border="0" src="skin/images/printer.gif"/><br/>
  +              print-friendly<br/>
  +              version</a></td>
  +          </tr>
  +        </table>
         </xsl:if>
         <xsl:if test="normalize-space(header/subtitle)!=''">
           <h3>
  @@ -27,7 +40,7 @@
           </p>
         </xsl:if>
         <xsl:apply-templates select="body"/>
  -    </td>
  +    </div>
     </xsl:template>
     <xsl:template match="body">
       <xsl:if test="section and not($isfaq='true')">
  @@ -54,7 +67,7 @@
       </xsl:if>
       <xsl:apply-templates/>
     </xsl:template>
  -<!--  section handling
  +  <!--  section handling
     - <a name/> anchors are added if the id attribute is specified
     - generated anchors are still included for TOC - what should we do about this?
     - FIXME: provide a generic facility to process section irrelevant to their
  @@ -130,6 +143,9 @@
         </xsl:if>
       </img>
     </xsl:template>
  +  <xsl:template match="code">
  +    <span class="codefrag"><xsl:value-of select="."/></span>
  +  </xsl:template>
     <xsl:template match="figure">
       <div align="center">
         <img src="{@src}" alt="{@alt}" class="figure">
  @@ -143,7 +159,12 @@
       </div>
     </xsl:template>
     <xsl:template match="table">
  -    <table class="table" cellpadding="4" cellspacing="1">
  +    <table cellpadding="4" cellspacing="1" class="ForrestTable">
  +      <xsl:if test="@cellspacing"><xsl:attribute name="cellspacing"><xsl:value-of select="@cellspacing"/></xsl:attribute></xsl:if>
  +      <xsl:if test="@cellpadding"><xsl:attribute name="cellpadding"><xsl:value-of select="@cellpadding"/></xsl:attribute></xsl:if>
  +      <xsl:if test="@border"><xsl:attribute name="border"><xsl:value-of select="@border"/></xsl:attribute></xsl:if>
  +      <xsl:if test="@class"><xsl:attribute name="class"><xsl:value-of select="@class"/></xsl:attribute></xsl:if>
  +      <xsl:if test="@bgcolor"><xsl:attribute name="bgcolor"><xsl:value-of select="@bgcolor"/></xsl:attribute></xsl:if>
         <xsl:apply-templates/>
       </table>
     </xsl:template>
  
  
  
  1.3       +160 -94   xml-forrest/src/resources/skins/forrest-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- site2xhtml.xsl	3 Jun 2002 17:26:07 -0000	1.2
  +++ site2xhtml.xsl	30 Jul 2002 01:29:23 -0000	1.3
  @@ -1,101 +1,167 @@
   <?xml version="1.0"?>
  -
  -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  -
  -  <xsl:template match="site">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">  <xsl:template match="site">
       <html>
         <head>
  -        <title>
  -          <xsl:value-of select="td[@class='content']/h2"/>
  -        </title>
  +        <title><xsl:value-of select="div[@class='content']/h1"/></title>
           <link rel="stylesheet" href="skin/page.css" type="text/css"/>
         </head>
  -
  -      <body>
  -
  -        <div class="path">
  -          <a href="@link1.href@">@link1@</a> : <a href="@link2.href@">@link2@</a> : <a href="@link3.href@">@link3@</a>
  -        </div>
  -
  -        <table class="top" cellspacing="0" cellpadding="0" summary="top bar">
  -          <tr>
  -            <td>
  -              <a href="@group-logo.href@"><img src="@group-logo.src@" border="0"/></a>
  -            </td>
  -            <td valign="middle" align="center" width="100%">
  -              <a href="@project-logo.href@"><img src="@project-logo.src@" border="0"/></a>
  -            </td>
  -            <td valign="top" height="69" nowrap="nowrap">
  -              <div class="search">
  -
  -               <form method="get" action="http://www.google.com/search" onsubmit="q.value = query.value + ' site:xml.apache.org'">
  +      <body bgcolor="#FFFFFF" text="#000000" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
  +      <!-- =========================== top line with navigation path ========================== -->
  +    <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="navigation path">
  +      <tr>
  +        <td height="20" bgcolor="#CFDCED" valign="middle" nowrap="nowrap">
  +          <img src="skin/images/spacer.gif" border="0" alt="" width="5" height="1" />
  +          
  +          <!-- breadcrumb trail (javascript-generated) -->
  +          <font face="Arial, Helvetica, Sans-serif" size="2">
  +              <script type="text/javascript" language="JavaScript" src="skin/breadcrumbs.js"></script>
  +          </font>
  +          <!-- end breadcrumb trail -->
  +          <!-- old trail -->
  +          <!--<a href="@link1.href@">@link1@</a> &#62; <a href="@link2.href@">@link2@</a> &#62; <a href="@link3.href@">@link3@</a>-->
  +        </td>
  +      </tr>
  +      <tr>
  +        <td height="2" bgcolor="#4C6C8F"><img src="skin/images/spacer.gif" border="0" alt="" width="2" height="2" /></td>
  +      </tr>
  +    </table>
  +    <!-- ================================= top bar with logo's and search box ===================================  -->
  +        <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="header with logos">
  +      <tr>
  +        <td bgcolor="#294563"><a href="@group-logo.href@"><img src="@group-logo.src@" alt="@group-logo.alt@" width="220" height="65" border="0"/></a></td>
  +        <td bgcolor="#294563" align="center" width="100%"><a href="@project-logo.href@"><img src="@project-logo.src@" border="0" width="220" height="65" alt="@project-logo.alt@" /></a></td>
  +        <td bgcolor="#294563" rowspan="2" valign="top">
  +          <form method="get" action="http://www.google.com/search" onsubmit="q.value = query.value + ' site:xml.apache.org'" target="_blank">
  +            <table bgcolor="#4C6C8F" cellpadding="0" cellspacing="0" border="0" summary="search">
  +              <tr>
  +                <td colspan="3"><img src="skin/images/spacer.gif" alt="" width="1" height="10" /></td>
  +              </tr>
  +              <tr>
  +                <td><img src="skin/images/spacer.gif" alt="" width="1" height="1" /></td>
  +                <td nowrap="nowrap">
                     <input type="hidden" name="q"/>
  -                  <input type="text" id="query" size="15"/>&#160;<input type="button" value="Search" name="Search"/><br/>
  -                  <!-- <input type="radio" name="web" value="web">web site&#160;</input>&#160;<input type="radio" name="mail" value="mail">mail lists</input> -->
  -                </form>
  -              </div>
  -            </td>
  -          </tr>
  -        </table>
  -
  -        <div class="tabs">
  -          <span class="tab">
  -            <a href="http://xml.apache.org/forrest/">Home</a>
  -          </span>
  -          <!--
  -          <span class="tab">
  -            <a href="#">not</a>
  -          </span>
  -          <span class="tab">
  -            <a href="#">implemented</a>
  -          </span>
  -          <span class="tab">
  -            <a href="#">yet</a>
  -          </span>
  -          -->
  -        </div>
  -
  -
  -       <div class="topline">&#160;</div>
  -
  -        <table cellspacing="0" cellpadding="0" summary="content pane">
  -          <tr>
  -            <td width="10px" class="navbar">&#160;</td>
  -            <td rowspan="2" valign="top" nowrap="nowrap" width="160px">
  -              <xsl:apply-templates select="div[@class='menu']"/>
  -            </td>
  -            <!-- <td valign="top" class="navbar" align="left">no chunking yet</td> -->
  -            <td valign="top" class="navbar" align="left">&#160;</td>
  -            <td width="*" valign="top" class="navbar" align="right">
  -              <!-- <a href="#">&lt;&lt; prev</a> <strong>[x]</strong> <a href="#">next &gt;&gt;</a> -->
  -              &#160;
  -            </td>
  -          </tr>
  -          <tr>
  -            <td>&#160;</td>
  -            <xsl:apply-templates select="td[@class='content']"/>
  -         </tr>
  -          <tr>
  -            <td>&#160;</td>
  -
  -           <td>&#160;</td>
  -          </tr>
  -        </table>
  -        <div class="copyright">
  -           <script language="JavaScript">
  -            <![CDATA[<!-- 
  -              document.write("Copyright @year@ @vendor@. All Rights Reserved. - "+"Last Published: " + document.lastModified); 
  -            //  -->]]>
  -          </script>
  -        </div>
  +                  <input type="text" id="query" size="15"/><img src="skin/images/spacer.gif" alt="" width="5" height="1" /><input type="submit" value="Search" name="Search"/>
  +                  <br />
  +                  <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
  +                  the xml.apache.org sites
  +<!-- setting search options off for the moment -->
  +<!--
  +                    <input type="radio" name="web" value="web"/>web site&#160;&#160;<input type="radio" name="mail" value="mail"/>mail lists
  +-->
  +                  </font>
  +                </td>
  +                <td><img src="skin/images/spacer.gif" alt="" width="1" height="1" /></td>
  +              </tr>
  +              <tr>
  +                <td><img src="skin/images/search-left.gif" width="9" height="10" border="0" alt="" /></td>
  +                <td><img src="skin/images/spacer.gif" alt="" width="1" height="1" /></td>
  +                <td><img src="skin/images/search-right.gif" width="9" height="10" border="0" alt="" /></td>
  +              </tr>
  +            </table>
  +          </form>
  +        </td>
  +        <td bgcolor="#294563"><img src="skin/images/spacer.gif" alt="" width="10" height="10" /></td>
  +      </tr>
  +      <tr>
  +        <td colspan="2" bgcolor="#294563" valign="bottom">
  +            <xsl:apply-templates select="div[@class='tab']"/>
  +        </td>
  +        <td bgcolor="#294563"><img src="skin/images/spacer.gif" height="1" width="1" alt="" /></td>
  +      </tr>
  +      <tr>
  +        <td colspan="4" bgcolor="#4C6C8F"><img src="skin/images/spacer.gif" alt="" height="10" width="1" /></td>
  +      </tr>
  +    </table>
  +    <!-- ======================================  Menu and Content table ====================================== -->
  +    <table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="#ffffff" summary="page content">
  +      <tr>
  +        <td valign="top">
  +          <table cellpadding="0" cellspacing="0" border="0" summary="menu">
  +            <tr>
  +              <td valign="top" rowspan="3">
  +                <table cellspacing="0" cellpadding="0" border="0" summary="blue line">
  +                  <tr><td bgcolor="#294563"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td></tr>
  +                  <tr><td bgcolor="#CFDCED"><font face="Arial, Helvetica, Sans-serif" size="4" color="#4C6C8F">&#160;</font></td></tr>
  +                  <tr><td bgcolor="#294563"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td></tr>
  +                </table>
  +              </td>
  +              <td bgcolor="#294563"><img src="skin/images/spacer.gif" alt="" height="1" width="1" /></td>
  +              <td bgcolor="#4C6C8F" valign="bottom"><img src="skin/images/spacer.gif" alt="" height="10" width="10" /></td>
  +              <td bgcolor="#4C6C8F" valign="top" nowrap="nowrap">
  +                  <xsl:apply-templates select="div[@class='menu']"/>
  +              </td>
  +              <td bgcolor="#4C6C8F" valign="bottom"><img src="skin/images/spacer.gif" alt="" height="10" width="10" /></td>
  +              <td bgcolor="#294563"><img src="skin/images/spacer.gif" alt="" height="1" width="1" /></td>
  +            </tr>
  +            <tr>
  +              <td bgcolor="#4C6C8F" rowspan="2" colspan="2" align="left" valign="bottom"><img src="skin/images/menu-left.gif" alt="" border="0" width="10" height="10" /></td>
  +              <td bgcolor="#4C6C8F"><img src="skin/images/spacer.gif" alt="" border="0" width="10" height="10" /></td>
  +              <td bgcolor="#4C6C8F" rowspan="2" colspan="2" align="right" valign="bottom"><img src="skin/images/menu-right.gif" alt="" border="0" width="10" height="10" /></td>
  +            </tr>
  +            <tr>
  +              <td bgcolor="#294563" height="1"><img src="skin/images/spacer.gif" alt="" height="1" width="1" /></td>
  +            </tr>
  +          </table>
  +        </td>
  +        <td width="100%" valign="top">
  +          <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="content">
  +            <tr><td bgcolor="#294563" colspan="4"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td></tr>
  +            <tr>
  +              <td bgcolor="#CFDCED" width="10" align="left"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td>
  +              <td bgcolor="#CFDCED" width="50%" align="left">
  +<!-- ========================================= Page number ===================================== -->
  +                <font face="Arial, Helvetica, Sans-serif" size="3" color="#4C6C8F">
  +                &#160;
  +<!--
  +                  <b>Page 1 of 5</b>
  +-->
  +                </font>
  +                  <img src="skin/images/spacer.gif" alt="" height="8" width="10" />
  +              </td>
  +              <td bgcolor="#CFDCED" width="50%" align="right">
  +<!--  ====================================== page navigation ===================================== -->
  +                <font face="Arial, Helvetica, Sans-serif" size="3" color="#4C6C8F">
  +                &#160;
  +<!--
  +                  <b>&#171; prev&#160;&#160;<font size="4">[3]</font>&#160;&#160;next &#187;</b>
  +-->
  +                </font>
  +                  <img src="skin/images/spacer.gif" alt="" height="8" width="10" />
  +              </td>
  +              <td bgcolor="#CFDCED" width="10"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td>
  +            </tr>
  +            <tr><td bgcolor="#294563" colspan="4"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td></tr>
  +            <tr>
  +              <td width="10" align="left"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td>
  +              <td width="100%" align="left">
  +                <xsl:apply-templates select="div[@class='content']"/>
  +              </td>
  +              <td width="10"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td>
  +            </tr>
  +          </table>
  +        </td>
  +      </tr>
  +    </table>
  +<!-- footer -->
  +    <table border="0" height="20" width="100%" cellpadding="0" cellspacing="0" summary="footer">
  +      <tr>
  +        <td width="10"><img src="skin/images/spacer.gif" alt="" height="1" width="10" /></td>
  +      </tr>
  +      <tr><td bgcolor="#4C6C8F" height="1" colspan="2"><img src="skin/images/spacer.gif" alt="" width="1" height="1" /><a href="skin/images/label.gif"></a><a href="skin/images/page.gif"></a><a href="skin/images/chapter.gif"></a><a href="skin/images/chapter_open.gif"></a><a href="skin/images/current.gif"></a><a href="/favicon.ico"></a></td></tr>
  +      <tr>
  +        <td align="center" class="copyright" bgcolor="#CFDCED" colspan="2">
  +          <font face="Arial, Helvetica, Sans-Serif" size="2">Copyright &#169; @year@ @vendor@. All Rights Reserved<script language="JavaScript" type="text/javascript"><![CDATA[<!--
  +              document.write(". - "+"Last Published: " + document.lastModified);
  +            //  -->]]></script></font>
  +        </td>
  +      </tr>
  +    </table>
         </body>
  -    </html>
  -  </xsl:template>
  -
  -  <xsl:template match="node()|@*" priority="-1">
  -    <xsl:copy>
  -      <xsl:apply-templates select="@*"/>
  -      <xsl:apply-templates/>
  -    </xsl:copy>
  -  </xsl:template>
  -</xsl:stylesheet>
  \ No newline at end of file
  +    </html></xsl:template>
  +    <xsl:template match="node()|@*" priority="-1">
  +      <xsl:copy>
  +        <xsl:apply-templates select="@*"/>
  +        <xsl:apply-templates/>
  +      </xsl:copy>
  +    </xsl:template>
  +  </xsl:stylesheet>
  
  
  
  1.2       +1 -1      xml-forrest/src/resources/skins/forrest-site/xslt/html/tab2menu.xsl
  
  Index: tab2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/tab2menu.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tab2menu.xsl	7 Jun 2002 13:15:27 -0000	1.1
  +++ tab2menu.xsl	30 Jul 2002 01:29:23 -0000	1.2
  @@ -14,7 +14,7 @@
             <tr>
               <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-left.gif" alt="" width="5" height="5" /></td>
               <td bgcolor="#B2C4E0" valign="middle">
  -              <a href="/xml-forrest/{@dir}"><font face="Arial, Helvetica, Sans-serif" size="2"><xsl:value-of select="@label"/></font></a>
  +              <a href="/forrest/{@dir}"><font face="Arial, Helvetica, Sans-serif" size="2"><xsl:value-of select="@label"/></font></a>
               </td>
               <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-right.gif" alt="" width="5" height="5" />
               </td>
  
  
  

Mime
View raw message