patches/docbook-style-xsl-02-marginleft.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18241 71030b8677ec
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
     1
diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
     2
--- docbook-xsl-1.74.0.orig/fo/lists.xsl	2008-06-01 23:36:39.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
     3
+++ docbook-xsl-1.74.0/fo/lists.xsl	2008-08-06 13:32:46.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
     4
@@ -324,7 +324,7 @@
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     5
       </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     6
       <xsl:when test="@termlength">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     7
         <xsl:variable name="termlength.is.number">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     8
-          <xsl:value-of select="@termlength + 0"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
     9
+          <xsl:value-of select="@termlength"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    10
         </xsl:variable>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    11
         <xsl:choose>
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    12
           <xsl:when test="string($termlength.is.number) = 'NaN'">
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    13
@@ -333,15 +333,7 @@
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    14
           </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    15
           <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    16
             <xsl:value-of select="@termlength"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    17
-            <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    18
-              <!-- workaround for passivetex lack of support for non-constant expressions -->
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    19
-              <xsl:when test="$passivetex.extensions != 0">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    20
-                <xsl:text>em</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    21
-              </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    22
-              <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    23
-                <xsl:text>em * 0.60</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    24
-              </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    25
-            </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    26
+            <xsl:text>em</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    27
           </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    28
         </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    29
       </xsl:when>
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    30
@@ -350,15 +342,7 @@
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    31
           <xsl:with-param name="terms" select="varlistentry/term"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    32
           <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
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:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    35
-          <!-- workaround for passivetex lack of support for non-constant expressions -->
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    36
-          <xsl:when test="$passivetex.extensions != 0">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    37
-            <xsl:text>em</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    38
-          </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    39
-          <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    40
-            <xsl:text>em * 0.60</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    41
-          </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    42
-        </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    43
+        <xsl:text>em</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    44
       </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    45
     </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    46
   </xsl:variable>
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    47
@@ -372,17 +356,7 @@
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    48
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    49
   <xsl:variable name="label-separation">1em</xsl:variable>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    50
   <xsl:variable name="distance-between-starts">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    51
-    <xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    52
-      <!-- workaround for passivetex lack of support for non-constant expressions -->
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    53
-      <xsl:when test="$passivetex.extensions != 0">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    54
-        <xsl:value-of select="$termlength"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    55
-      </xsl:when>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    56
-      <xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    57
-        <xsl:value-of select="$termlength"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    58
-        <xsl:text>+</xsl:text>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    59
-        <xsl:value-of select="$label-separation"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    60
-      </xsl:otherwise>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    61
-    </xsl:choose>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    62
+    <xsl:value-of select="$termlength"/>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    63
   </xsl:variable>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    64
 
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    65
   <xsl:if test="title">
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    66
diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    67
--- docbook-xsl-1.74.0.orig/fo/param.xsl	2008-06-02 01:06:18.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    68
+++ docbook-xsl-1.74.0/fo/param.xsl	2008-08-06 13:32:46.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    69
@@ -133,8 +133,8 @@
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    70
 <xsl:attribute-set name="component.title.properties">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    71
   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    72
   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    73
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    74
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    75
+  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    76
+  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
9361
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    77
   <xsl:attribute name="hyphenate">false</xsl:attribute>
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    78
   <xsl:attribute name="text-align">
dce06c7c3c13 2007-02-26 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset
    79
     <xsl:choose>
18241
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    80
diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    81
--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl	2009-05-11 11:40:49.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    82
+++ docbook-xsl-1.75.0/fo/pagesetup.xsl	2009-05-11 11:42:29.000000000 +0200
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    83
@@ -30,16 +30,7 @@
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    84
 </xsl:param>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    85
 
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    86
 <xsl:param name="margin.left.inner">
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    87
-  <xsl:choose>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    88
-    <xsl:when test="$passivetex.extensions != 0">
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    89
-      <xsl:value-of select="$page.margin.inner"/>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    90
-    </xsl:when>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    91
-    <xsl:otherwise>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    92
-      <xsl:value-of select="$page.margin.inner"/>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    93
-      <xsl:text> - </xsl:text>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    94
-      <xsl:value-of select="$title.margin.left"/>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    95
-    </xsl:otherwise>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    96
-  </xsl:choose>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    97
+  <xsl:value-of select="$page.margin.inner"/>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    98
 </xsl:param>
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
    99
 
71030b8677ec 2010-07-15 Alan Coopersmith <[email protected]>
alanc
parents: 9361
diff changeset
   100
 <xsl:template name="setup.pagemasters">