patches/docbook-style-xsl-03-lists.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 9361 dce06c7c3c13
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     1
--- docbook-xsl-1.69.1/fo/lists.xsl.orig	2006-01-19 02:36:22.000000000 -0800
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     2
+++ docbook-xsl-1.69.1/fo/lists.xsl	2006-01-19 02:34:54.000000000 -0800
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     3
@@ -125,9 +130,18 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     4
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     5
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     6
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     7
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     8
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     9
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    10
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    11
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    12
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    13
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    14
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    15
-        <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    16
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    17
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    18
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    19
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    20
     </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    21
   </xsl:variable>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    22
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    23
@@ -287,9 +301,18 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    24
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    25
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    26
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    27
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    28
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    29
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    30
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    31
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    32
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    33
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    34
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    35
-        <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    36
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    37
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    38
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    39
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    40
     </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    41
   </xsl:variable>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    42
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    43
@@ -486,9 +509,18 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    44
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    45
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    46
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    47
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    48
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    49
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    50
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    51
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    52
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    53
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    54
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    55
-        <xsl:apply-templates select="listitem"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    56
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    57
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    58
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    59
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    60
     </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    61
   </fo:list-item>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    62
 </xsl:template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    63
@@ -906,9 +938,18 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    64
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    65
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    66
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    67
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    68
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    69
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    70
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    71
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    72
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    73
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    74
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    75
-        <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    76
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    77
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    78
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    79
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    80
     </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    81
   </fo:list-item>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    82
 </xsl:template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    83
@@ -932,9 +973,18 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    84
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    85
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    86
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    87
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    88
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    89
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    90
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    91
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    92
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    93
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    94
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    95
-        <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    96
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    97
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    98
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    99
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   100
     </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   101
   </fo:list-item>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   102
 </xsl:template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   103
@@ -1112,10 +1162,19 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   104
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   105
     </fo:list-item-label>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   106
     <fo:list-item-body start-indent="body-start()">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   107
+    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   108
+     <xsl:when test="child::*[1][local-name()='para' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   109
+      local-name()='simpara' or
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   110
+      local-name()='formalpara']">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   111
+      <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   112
+     </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   113
+     <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   114
       <fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   115
-        <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   116
+       <xsl:apply-templates/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   117
       </fo:block>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   118
-    </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   119
+     </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   120
+    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   121
+   </fo:list-item-body>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   122
   </fo:list-item>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
   123
 </xsl:template>