Changeset 8143

Show
Ignore:
Timestamp:
05/27/07 02:56:44 (1 year ago)
Author:
manuel
Message:

Updated docbook-xsl-snapshot to r6823

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/new-xsl/docbook-xsl-snapshot/VERSION

    r8131 r8143  
    1818  <fm:Project>DocBook</fm:Project> 
    1919  <fm:Branch>XSL Stylesheets</fm:Branch> 
    20   <fm:Version>snapshot_6804</fm:Version> 
     20  <fm:Version>snapshot_6823</fm:Version> 
    2121<!-- 
    2222  <fm:License>MIT/X Consortium License</fm:License> 

  • branches/new-xsl/docbook-xsl-snapshot/fo/docbook.xsl

    r7978 r8143  
    119119<xsl:template match="/"> 
    120120  <xsl:choose> 
     121    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     122         toss the namespace and continue.  Use the docbook5 namespaced 
     123         stylesheets for DocBook5 if you don't want to use this feature.--> 
    121124    <!-- include extra test for Xalan quirk --> 
    122125    <xsl:when test="(function-available('exsl:node-set') or 
    …… 
    124127                       'Apache Software Foundation')) 
    125128                    and (*/self::ng:* or */self::db:*)"> 
    126       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
    127            toss the namespace and continue. Someday we'll reverse this logic 
    128            and add the namespace to documents that don't have one. 
    129            But not before the whole stylesheet has been converted to use 
    130            namespaces. i.e., don't hold your breath --> 
    131129      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message> 
    132130      <xsl:variable name="nons"> 

  • branches/new-xsl/docbook-xsl-snapshot/fo/lists.xsl

    r7978 r8143  
    517517 
    518518<xsl:template match="varlistentry" mode="vl.as.list"> 
    519   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> 
    520   <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing"> 
     519  <xsl:variable name="id"> 
     520    <xsl:call-template name="object.id"/> 
     521  </xsl:variable> 
     522  <xsl:variable name="item.contents"> 
    521523    <fo:list-item-label end-indent="label-end()" text-align="start"> 
    522524      <fo:block> 
    …… 
    529531      </fo:block> 
    530532    </fo:list-item-body> 
    531   </fo:list-item> 
    532 </xsl:template> 
     533  </xsl:variable> 
     534 
     535  <xsl:choose> 
     536    <xsl:when test="parent::*/@spacing = 'compact'"> 
     537      <fo:list-item id="{$id}" 
     538          xsl:use-attribute-sets="compact.list.item.spacing"> 
     539        <xsl:copy-of select="$item.contents"/> 
     540      </fo:list-item> 
     541    </xsl:when> 
     542    <xsl:otherwise> 
     543      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing"> 
     544        <xsl:copy-of select="$item.contents"/> 
     545      </fo:list-item> 
     546    </xsl:otherwise> 
     547  </xsl:choose> 
     548</xsl:template> 
     549 
    533550 
    534551<xsl:template match="variablelist" mode="vl.as.blocks"> 

  • branches/new-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl

    r7978 r8143  
    115115<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Processing stripped document.</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/"> 
    116116  <xsl:choose> 
     117    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     118         toss the namespace and continue.  Use the docbook5 namespaced 
     119         stylesheets for DocBook5 if you don't want to use this feature.--> 
    117120    <!-- include extra test for Xalan quirk --> 
    118121    <xsl:when test="false()"/> 

  • branches/new-xsl/docbook-xsl-snapshot/fo/table.xsl

    r8102 r8143  
    211211    </xsl:when> 
    212212    <xsl:when test="@pgwide = 1"> 
    213       <fo:block span="all" start-indent="0pt" end-indent="0pt"> 
     213      <fo:block xsl:use-attribute-sets="pgwide.properties"> 
    214214        <xsl:copy-of select="$table.block"/> 
    215215      </fo:block> 

  • branches/new-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl

    r7978 r8143  
    382382<xsl:template match="/"> 
    383383  <xsl:choose> 
     384    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     385         toss the namespace and continue.  Use the docbook5 namespaced 
     386         stylesheets for DocBook5 if you don't want to use this feature.--> 
    384387    <!-- include extra test for Xalan quirk --> 
    385388    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)"> 
    386       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
    387            toss the namespace and continue. Someday we'll reverse this logic 
    388            and add the namespace to documents that don't have one. 
    389            But not before the whole stylesheet has been converted to use 
    390            namespaces. i.e., don't hold your breath --> 
    391389      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message> 
    392390      <xsl:variable name="nons"> 

  • branches/new-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl

    r7978 r8143  
    304304<xsl:template match="/"> 
    305305  <xsl:choose> 
     306    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     307         toss the namespace and continue.  Use the docbook5 namespaced 
     308         stylesheets for DocBook5 if you don't want to use this feature.--> 
    306309    <!-- include extra test for Xalan quirk --> 
    307310    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)"> 
    308       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
    309            toss the namespace and continue. Someday we'll reverse this logic 
    310            and add the namespace to documents that don't have one. 
    311            But not before the whole stylesheet has been converted to use 
    312            namespaces. i.e., don't hold your breath --> 
    313311      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message> 
    314312      <xsl:variable name="nons"> 

  • branches/new-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl

    r7978 r8143  
    5050  <xsl:variable name="targets" select="key('id',@linkend)"/> 
    5151  <xsl:variable name="footnote" select="$targets[1]"/> 
    52   <xsl:variable name="href"> 
     52 
     53  <xsl:variable name="target.href"> 
     54    <xsl:call-template name="href.target"> 
     55      <xsl:with-param name="object" select="$footnote"/> 
     56    </xsl:call-template> 
     57  </xsl:variable> 
     58 
     59  <xsl:variable name="href"> 
     60    <xsl:value-of select="substring-before($target.href, '#')"/> 
    5361    <xsl:text>#ftn.</xsl:text> 
    54     <xsl:call-template name="object.id"> 
    55       <xsl:with-param name="object" select="$footnote"/> 
    56     </xsl:call-template> 
    57   </xsl:variable> 
     62    <xsl:value-of select="substring-after($target.href, '#')"/> 
     63  </xsl:variable> 
     64 
    5865  <sup> 
    5966    <xsl:text>[</xsl:text> 

  • branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl

    r7978 r8143  
    382382<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Processing stripped document.</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/"> 
    383383  <xsl:choose> 
     384    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     385         toss the namespace and continue.  Use the docbook5 namespaced 
     386         stylesheets for DocBook5 if you don't want to use this feature.--> 
    384387    <!-- include extra test for Xalan quirk --> 
    385388    <xsl:when test="false()"/> 

  • branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl

    r7978 r8143  
    304304<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Processing stripped document.</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/"> 
    305305  <xsl:choose> 
     306    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, 
     307         toss the namespace and continue.  Use the docbook5 namespaced 
     308         stylesheets for DocBook5 if you don't want to use this feature.--> 
    306309    <!-- include extra test for Xalan quirk --> 
    307310    <xsl:when test="false()"/>