Return-Path: 
 <forrest-cvs-return-838-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 4630 invoked by uid 500); 14 Apr 2003 13:39:42 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 4578 invoked from network); 14 Apr 2003 13:39:42 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 14 Apr 2003 13:39:42 -0000
Received: (qmail 17144 invoked by uid 1352); 14 Apr 2003 13:39:42 -0000
Date: 14 Apr 2003 13:39:42 -0000
Message-ID: <20030414133942.17143.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/skins/common/xslt/fo
 document2fo.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/04/14 06:39:42

  Modified:    src/resources/skins/common/xslt/fo document2fo.xsl
  Log:
  Emulate browser rendition of <ul><ul>, <ol><ol> and other combinations
  
  Revision  Changes    Path
  1.10      +16 -1     xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- document2fo.xsl	10 Apr 2003 14:22:32 -0000	1.9
  +++ document2fo.xsl	14 Apr 2003 13:39:41 -0000	1.10
  @@ -316,7 +316,22 @@
         </fo:list-item-body>
       </fo:list-item>
     </xsl:template>
  -  
  +
  +  <!-- Emulate browser handling of these invalid combinations that our DTD
  +  unfortunately allows -->
  +  <xsl:template match="ul/ul | ul/ol | ol/ul | ol/ol">
  +    <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-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 end-indent="label-end()">