patches/docbook-style-xsl-01-pagesetup.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 9361 dce06c7c3c13
child 18241 71030b8677ec
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/pagesetup.xsl.orig	2005-12-10 14:08:28.000000000 -0600
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     2
+++ docbook-xsl-1.69.1/fo/pagesetup.xsl	2006-01-01 19:49:28.000000000 -0600
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     3
@@ -1491,32 +1491,29 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     4
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     5
       <fo:table-column column-number="1">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     6
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     7
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     8
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     9
             <xsl:with-param name="location">header</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    10
             <xsl:with-param name="position" select="$column1"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    11
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    12
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    13
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    14
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    15
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    16
       <fo:table-column column-number="2">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    17
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    18
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    19
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    20
             <xsl:with-param name="location">header</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    21
             <xsl:with-param name="position" select="2"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    22
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    23
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    24
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    25
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    26
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    27
       <fo:table-column column-number="3">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    28
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    29
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    30
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    31
             <xsl:with-param name="location">header</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    32
             <xsl:with-param name="position" select="$column3"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    33
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    34
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    35
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    36
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    37
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    38
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    39
@@ -1812,32 +1809,29 @@
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    40
       </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    41
       <fo:table-column column-number="1">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    42
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    43
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    44
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    45
             <xsl:with-param name="location">footer</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    46
             <xsl:with-param name="position" select="$column1"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    47
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    48
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    49
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    50
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    51
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    52
       <fo:table-column column-number="2">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    53
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    54
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    55
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    56
             <xsl:with-param name="location">footer</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    57
             <xsl:with-param name="position" select="2"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    58
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    59
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    60
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    61
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    62
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    63
       <fo:table-column column-number="3">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    64
         <xsl:attribute name="column-width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    65
-          <xsl:text>proportional-column-width(</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    66
           <xsl:call-template name="header.footer.width">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    67
             <xsl:with-param name="location">footer</xsl:with-param>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    68
             <xsl:with-param name="position" select="$column3"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    69
           </xsl:call-template>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    70
-          <xsl:text>)</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    71
+          <xsl:text>%</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    72
         </xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    73
       </fo:table-column>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    74