cvs: phpdoc /xsl bightml.xsl fo.xsl html-common.xsl

alindeman Tue Apr 22 07:43:41 2003 EDT Modified files: /phpdoc/xsl bightml.xsl fo.xsl html-common.xsl Log: getting rid of some windows line breaks...

Index: phpdoc/xsl/bightml.xsl diff -u phpdoc/xsl/bightml.xsl:1.1 phpdoc/xsl/bightml.xsl:1.2 --- phpdoc/xsl/bightml.xsl:1.1 Sun Mar 9 10:01:13 2003 +++ phpdoc/xsl/bightml.xsl Tue Apr 22 07:43:41 2003 @@ -15,13 +15,13 @@ <xsl:template match="copyright" mode="titlepage.mode" /> <!-- add missing separators --> -<xsl:template match="preface|part|chapter|reference|appendix|sect1|sect2"> - <hr/> - <xsl:apply-imports/> +<xsl:template match="preface|part|chapter|reference|appendix|sect1|sect2"> + <hr/> + <xsl:apply-imports/> </xsl:template> -<xsl:template match="reference/partintro/section"> - <xsl:apply-imports/> +<xsl:template match="reference/partintro/section"> + <xsl:apply-imports/> </xsl:template> <!-- Just decrease FILESIZE in this huge file --> Index: phpdoc/xsl/fo.xsl diff -u phpdoc/xsl/fo.xsl:1.4 phpdoc/xsl/fo.xsl:1.5 --- phpdoc/xsl/fo.xsl:1.4 Thu Apr 10 16:58:41 2003 +++ phpdoc/xsl/fo.xsl Tue Apr 22 07:43:41 2003 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version='1.0'?> <!-- fo.xsl: FO specific customizations (as a base for pdf) @@ -7,8 +7,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0"> - -<xsl:import href="docbook/fo/docbook.xsl"/> + +<xsl:import href="docbook/fo/docbook.xsl"/> <xsl:include href="common.xsl"/> @@ -56,12 +56,12 @@ set toc,title </xsl:param> - + <!-- ====================== PAGENUMBERS IN TOC ========================= --> <!-- Give the following elements an id, so that the toc can point to them --> <!-- Exception PART: Here the TOC in the part itself is added by hand --> -<!-- Correct page numbers for PARTS in main-TOC +<!-- Correct page numbers for PARTS in main-TOC and provide an own TOC in the several parts --> <xsl:template match="part"> <xsl:if test="not(partintro)"> @@ -98,7 +98,7 @@ <fo:block id="{$id}"> <xsl:call-template name="part.titlepage"/> </fo:block> - + <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> @@ -113,8 +113,8 @@ </xsl:if> <xsl:apply-templates/> </xsl:template> - - + + <!-- Correct page numbers for CHAPTERS in main-TOC --> <xsl:template match="chapter"> <xsl:variable name="id"> @@ -298,7 +298,7 @@ </fo:page-sequence> </xsl:template> - + <!-- Correct page numbers for the REFERENCE in main-TOC --> <xsl:template match="reference"> <xsl:variable name="id"> @@ -332,7 +332,7 @@ <fo:block id="{$id}"> <xsl:call-template name="reference.titlepage"/> </fo:block> - + <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> <xsl:with-param name="table" select="normalize-space($generate.toc)"/> @@ -347,11 +347,11 @@ </fo:page-sequence> <xsl:apply-templates/> </xsl:template> - + <!-- ==================== END PAGENUMBERS IN TOC ======================= --> - - -<!-- Show also the level below <PART> (chapter) in the MAIN-TOC --> + + +<!-- Show also the level below <PART> (chapter) in the MAIN-TOC --> <xsl:template match="part" mode="toc"> <xsl:param name="toc-context" select="."/> @@ -598,7 +598,7 @@ <!-- ==================== END REFERENCE/PARTINTRO TITLEPAGE =================== --> - + <!-- Just to save space --> <xsl:template match="refsect1"> <fo:block> @@ -626,16 +626,16 @@ <!-- FIXME: It's just a simple assumption that the title is always first, and the next node is always a (sim)para --> <xsl:template match="note"> - <xsl:variable name="inlinepara"> - <xsl:choose> - <xsl:when test="count(title) = 0"> - <xsl:apply-templates select="*[1]" mode="note.single.entry" /> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="*[2]" mode="note.single.entry" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> + <xsl:variable name="inlinepara"> + <xsl:choose> + <xsl:when test="count(title) = 0"> + <xsl:apply-templates select="*[1]" mode="note.single.entry" /> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*[2]" mode="note.single.entry" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" @@ -643,34 +643,34 @@ end-indent="0.25in"> <fo:block keep-with-next="always"> <fo:inline font-weight="bold"> - <xsl:choose> - <xsl:when test="count(title) > 0"> - <xsl:apply-templates select="title" mode="note.single.entry"/> - </xsl:when> - <xsl:otherwise> + <xsl:choose> + <xsl:when test="count(title) > 0"> + <xsl:apply-templates select="title" mode="note.single.entry"/> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="gentext"/> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> <xsl:text>: </xsl:text> </fo:inline> <xsl:copy-of select="$inlinepara"/> </fo:block> - <xsl:choose> - <xsl:when test="$inlinepara != '' and count(title) > 0"> - <xsl:apply-templates select="*[not(position() &lt; 3)]" /> - </xsl:when> - <xsl:when test="$inlinepara != '' and count(title) = 0"> - <xsl:apply-templates select="*[not(position() &lt; 2)]" /> - </xsl:when> - <xsl:otherwise> + <xsl:choose> + <xsl:when test="$inlinepara != '' and count(title) > 0"> + <xsl:apply-templates select="*[not(position() &lt; 3)]" /> + </xsl:when> + <xsl:when test="$inlinepara != '' and count(title) = 0"> + <xsl:apply-templates select="*[not(position() &lt; 2)]" /> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates /> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> </fo:block> </xsl:template> - + <!-- Add VERSION INFORMATION below FUNCTION name, prevent function names from appearing twice --> <xsl:template match="refnamediv"> @@ -808,10 +808,10 @@ <!-- ========================= APPENDIX RESOURCES ========================= --> - -<!-- Create page-master for landscape-pages, + +<!-- Create page-master for landscape-pages, is needed by the template 'appendix' above --> -<xsl:template name="user.pagemasters"> +<xsl:template name="user.pagemasters"> <fo:simple-page-master master-name="landscape-first" page-width="{$page.height.portrait}" page-height="{$page.width.portrait}" @@ -831,8 +831,8 @@ display-align="after"/> </fo:simple-page-master> </xsl:template> - -<!-- Don't hyphenate function-names in Appendix 'Resources' --> + +<!-- Don't hyphenate function-names in Appendix 'Resources' --> <xsl:template match="row[ancestor::appendix[@id='resource']]"> <xsl:param name="spans"/> @@ -858,9 +858,9 @@ </xsl:template> <!-- ======================= END APPENDIX RESOURCES ======================= --> - - - + + + <!-- Some EXAMPLES need MORE SPACE, unify the inner width of the several page-formats --> <xsl:param name="page.margin.inner"> @@ -1043,4 +1043,4 @@ -</xsl:stylesheet> +</xsl:stylesheet> Index: phpdoc/xsl/html-common.xsl diff -u phpdoc/xsl/html-common.xsl:1.20 phpdoc/xsl/html-common.xsl:1.21 --- phpdoc/xsl/html-common.xsl:1.20 Sun Mar 9 10:01:13 2003 +++ phpdoc/xsl/html-common.xsl Tue Apr 22 07:43:41 2003 @@ -38,7 +38,7 @@ <!-- Make the TOC-depths like in the DSSSL-version --> -<xsl:param name="toc.max.depth" select="1"/> +<xsl:param name="toc.max.depth" select="1"/> <xsl:template name="subtoc"> <xsl:param name="toc-context" select="."/> @@ -101,15 +101,15 @@ </xsl:choose> </xsl:variable> - <xsl:variable name="my.toc.max.depth"> - <xsl:choose> - <xsl:when test="local-name(..) = 'book'">2</xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$toc.max.depth"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - + <xsl:variable name="my.toc.max.depth"> + <xsl:choose> + <xsl:when test="local-name(..) = 'book'">2</xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$toc.max.depth"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:element name="{$toc.listitem.type}"> <xsl:variable name="label"> <xsl:apply-templates select="." mode="label.markup"/> @@ -256,79 +256,79 @@ </xsl:template> <xsl:template match="note"> - <xsl:variable name="inlinepara"> - <xsl:choose> - <xsl:when test="count(title) = 0"> - <xsl:apply-templates select="*[1]" mode="note.single.entry"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="*[2]" mode="note.single.entry"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> + <xsl:variable name="inlinepara"> + <xsl:choose> + <xsl:when test="count(title) = 0"> + <xsl:apply-templates select="*[1]" mode="note.single.entry"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*[2]" mode="note.single.entry"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <blockquote> <p> <b> - <xsl:choose> - <xsl:when test="count(title) > 0"> - <xsl:apply-templates select="title" mode="note.single.entry"/> - </xsl:when> - <xsl:otherwise> + <xsl:choose> + <xsl:when test="count(title) > 0"> + <xsl:apply-templates select="title" mode="note.single.entry"/> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="gentext"/> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> <xsl:text>: </xsl:text> </b> <xsl:copy-of select="$inlinepara"/> </p> - <xsl:choose> - <xsl:when test="$inlinepara != '' and count(title) > 0"> - <xsl:apply-templates select="*[not(position() &lt; 3)]" /> - </xsl:when> - <xsl:when test="$inlinepara != '' and count(title) = 0"> - <xsl:apply-templates select="*[not(position() &lt; 2)]" /> - </xsl:when> - <xsl:otherwise> + <xsl:choose> + <xsl:when test="$inlinepara != '' and count(title) > 0"> + <xsl:apply-templates select="*[not(position() &lt; 3)]" /> + </xsl:when> + <xsl:when test="$inlinepara != '' and count(title) = 0"> + <xsl:apply-templates select="*[not(position() &lt; 2)]" /> + </xsl:when> + <xsl:otherwise> <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> </blockquote> </xsl:template> <xsl:template match="warning|caution"> <xsl:variable name="pos"> - <xsl:choose> + <xsl:choose> <xsl:when test="count(title[1])=1">2</xsl:when> <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> + </xsl:choose> </xsl:variable> <div class="{name(.)}"> <p style="font-size:10px"></p> <table border="1" width="96%" align="center"> <tr> <td align="center"><b> - <xsl:choose> - <xsl:when test="$pos=2"> - <xsl:apply-templates select="title" mode="note.single.entry"/> - </xsl:when> - <xsl:otherwise> + <xsl:choose> + <xsl:when test="$pos=2"> + <xsl:apply-templates select="title" mode="note.single.entry"/> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="gentext"/> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> </b></td> </tr> <tr><td> <xsl:apply-templates select="*[position()=$pos]" mode="note.single.entry" /> - <xsl:choose> - <xsl:when test="(count(child::*)-$pos) > 1"> + <xsl:choose> + <xsl:when test="(count(child::*)-$pos) > 1"> <xsl:apply-templates select="*[position()>$pos and position()!=last()]" /> <xsl:apply-templates select="*[position()=last()]" mode="note.single.entry" /> - </xsl:when> - <xsl:otherwise> + </xsl:when> + <xsl:otherwise> <p style="font-size=8px"></p> <xsl:apply-templates select="*[position()>$pos]" mode="note.single.entry" /> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> </td></tr> </table> <p style="font-size:10px"></p>