From 332a56d0916b2df5ba2f3d612319a64fec9b5cd4 Mon Sep 17 00:00:00 2001 From: Bob Stayton Date: Sat, 7 Mar 2009 00:02:47 +0000 Subject: [PATCH] Change 'left' to 'start' and 'right' to 'end' to support right-to-left writing mode. --- xsl/params/admon.style.xml | 3 +- xsl/params/alignment.xml | 10 ++++++ .../article.appendix.title.properties.xml | 2 +- xsl/params/blockquote.properties.xml | 4 +-- xsl/params/body.start.indent.xml | 8 +++-- xsl/params/component.title.properties.xml | 2 +- xsl/params/foil.properties.xml | 4 +-- xsl/params/footer.column.widths.xml | 14 +++++--- xsl/params/header.column.widths.xml | 14 +++++--- xsl/params/index.div.title.properties.xml | 2 +- .../nongraphical.admonition.properties.xml | 4 +-- xsl/params/page.margin.inner.xml | 21 ++++++++---- xsl/params/page.margin.outer.xml | 18 ++++++---- xsl/params/pgwide.properties.xml | 2 +- xsl/params/root.properties.xml | 3 ++ xsl/params/section.title.properties.xml | 2 +- xsl/params/side.float.properties.xml | 14 ++++---- xsl/params/sidebar.float.type.xml | 29 ++++++++++++---- xsl/params/sidebar.properties.xml | 8 ++--- xsl/params/table.cell.padding.xml | 4 +-- xsl/params/title.margin.left.xml | 33 ++++++++++--------- xsl/params/writing.mode.xml | 5 ++- 22 files changed, 133 insertions(+), 73 deletions(-) diff --git a/xsl/params/admon.style.xml b/xsl/params/admon.style.xml index c2c881c31..38f1c27ac 100644 --- a/xsl/params/admon.style.xml +++ b/xsl/params/admon.style.xml @@ -16,7 +16,8 @@ admonitions. - margin-left: 0.5in; margin-right: 0.5in; + diff --git a/xsl/params/alignment.xml b/xsl/params/alignment.xml index 0d5d9cea8..9c0a3de35 100644 --- a/xsl/params/alignment.xml +++ b/xsl/params/alignment.xml @@ -9,7 +9,9 @@ list open left + start right + end center justify @@ -25,6 +27,14 @@ Description The default text alignment is used for most body text. +Allowed values are +left, +right, +start, +end, +center, +justify. +The default value is justify. diff --git a/xsl/params/article.appendix.title.properties.xml b/xsl/params/article.appendix.title.properties.xml index e94088695..61337a1bd 100644 --- a/xsl/params/article.appendix.title.properties.xml +++ b/xsl/params/article.appendix.title.properties.xml @@ -16,7 +16,7 @@ - + diff --git a/xsl/params/blockquote.properties.xml b/xsl/params/blockquote.properties.xml index 440f04e29..76d7f1c36 100644 --- a/xsl/params/blockquote.properties.xml +++ b/xsl/params/blockquote.properties.xml @@ -16,8 +16,8 @@ -0.5in -0.5in +0.5in +0.5in 0.5em 1em 2em diff --git a/xsl/params/body.start.indent.xml b/xsl/params/body.start.indent.xml index 461e90dba..4e348f1c7 100644 --- a/xsl/params/body.start.indent.xml +++ b/xsl/params/body.start.indent.xml @@ -28,11 +28,13 @@ Description This parameter provides -one means of indenting the body text relative to -the left page margin. +the means of indenting the body text relative to +section titles. +For left-to-right text direction, it indents the left side. +For right-to-left text direction, it indents the right side. It is used in place of the title.margin.left for -all XSL-FO processors except FOP. +all XSL-FO processors except FOP 0.25. It enables support for side floats to appear in the indented margin area. diff --git a/xsl/params/component.title.properties.xml b/xsl/params/component.title.properties.xml index aff1c2906..58cd4b434 100644 --- a/xsl/params/component.title.properties.xml +++ b/xsl/params/component.title.properties.xml @@ -24,7 +24,7 @@ center - left + start diff --git a/xsl/params/foil.properties.xml b/xsl/params/foil.properties.xml index 00c229037..11ad146bb 100644 --- a/xsl/params/foil.properties.xml +++ b/xsl/params/foil.properties.xml @@ -19,8 +19,8 @@ - 1in - 1in + 1in + 1in diff --git a/xsl/params/footer.column.widths.xml b/xsl/params/footer.column.widths.xml index a17589b32..eca227059 100644 --- a/xsl/params/footer.column.widths.xml +++ b/xsl/params/footer.column.widths.xml @@ -28,14 +28,20 @@ three columns. The default value is The parameter value must be three numbers, separated by white space. The first number represents the relative -width of the left footer for -single-sided output, or the inside footer for +width of the inside footer for double-sided output. The second number is the relative width of the center footer. The third number is the -relative width of the right footer for -single-sided output, or the outside footer for +relative width of the outside footer for double-sided output. +For single-sided output, the first number is the +relative width of left footer for left-to-right +text direction, or the right footer for right-to-left +text direction. +The third number is the +relative width of right footer for left-to-right +text direction, or the left footer for right-to-left +text direction. The numbers are used to specify the column widths for the table that makes up the footer area. diff --git a/xsl/params/header.column.widths.xml b/xsl/params/header.column.widths.xml index 86a1fd8ad..7d85b96ad 100644 --- a/xsl/params/header.column.widths.xml +++ b/xsl/params/header.column.widths.xml @@ -28,14 +28,20 @@ three columns. The default value is The parameter value must be three numbers, separated by white space. The first number represents the relative -width of the left header for -single-sided output, or the inside header for +width of the inside header for double-sided output. The second number is the relative width of the center header. The third number is the -relative width of the right header for -single-sided output, or the outside header for +relative width of the outside header for double-sided output. +For single-sided output, the first number is the +relative width of left header for left-to-right +text direction, or the right header for right-to-left +text direction. +The third number is the +relative width of right header for left-to-right +text direction, or the left header for right-to-left +text direction. The numbers are used to specify the column widths for the table that makes up the header area. diff --git a/xsl/params/index.div.title.properties.xml b/xsl/params/index.div.title.properties.xml index 6ff2413e6..edbec2f2e 100644 --- a/xsl/params/index.div.title.properties.xml +++ b/xsl/params/index.div.title.properties.xml @@ -17,7 +17,7 @@ index - 0pt + 0pt 14.4pt bold diff --git a/xsl/params/nongraphical.admonition.properties.xml b/xsl/params/nongraphical.admonition.properties.xml index f66ddf434..ba8a06a5e 100644 --- a/xsl/params/nongraphical.admonition.properties.xml +++ b/xsl/params/nongraphical.admonition.properties.xml @@ -18,8 +18,8 @@ 0.8em 1em 1.2em - 0.25in - 0.25in + 0.25in + 0.25in diff --git a/xsl/params/page.margin.inner.xml b/xsl/params/page.margin.inner.xml index e2815ae68..535b02d9a 100644 --- a/xsl/params/page.margin.inner.xml +++ b/xsl/params/page.margin.inner.xml @@ -24,12 +24,21 @@ Description -The inner page margin is the distance from binding edge of the -page to the first column of text. In the left-to-right, top-to-bottom writing -direction, this is the left margin of recto pages. -The inner and outer margins are usually the same unless the output -is double-sided. - +The inner page margin is the distance from bound edge of the +page to the first column of text. + +The inner page margin is the distance from bound edge of the +page to the outer edge of the first column of text. + +In left-to-right text direction, +this is the left margin of recto (front side) pages. +For single-sided output, it is the left margin +of all pages. + +In right-to-left text direction, +this is the right margin of recto pages. +For single-sided output, this is the +right margin of all pages. diff --git a/xsl/params/page.margin.outer.xml b/xsl/params/page.margin.outer.xml index 654d0ffdb..3f8099700 100644 --- a/xsl/params/page.margin.outer.xml +++ b/xsl/params/page.margin.outer.xml @@ -24,12 +24,18 @@ Description -The outer page margin is the distance from non-binding edge of the -page to the last column of text. In the left-to-right, top-to-bottom writing -direction, this is the right margin of recto pages. -The inner and outer margins are usually the same unless the output -is double-sided. - +The outer page margin is the distance from non-bound edge of the +page to the outer edge of the last column of text. + +In left-to-right text direction, +this is the right margin of recto (front side) pages. +For single-sided output, it is the right margin +of all pages. + +In right-to-left text direction, +this is the left margin of recto pages. +For single-sided output, this is the +left margin of all pages. diff --git a/xsl/params/pgwide.properties.xml b/xsl/params/pgwide.properties.xml index c35525815..c63b4615b 100644 --- a/xsl/params/pgwide.properties.xml +++ b/xsl/params/pgwide.properties.xml @@ -37,7 +37,7 @@ In a stylesheet that sets the parameter body.start.indent to a non-zero value in order to indent body text, this attribute set can be used to outdent pgwide -figures to the left margin. +figures to the start margin. If a document uses a multi-column page layout, diff --git a/xsl/params/root.properties.xml b/xsl/params/root.properties.xml index 81401bbb7..26c9951f5 100644 --- a/xsl/params/root.properties.xml +++ b/xsl/params/root.properties.xml @@ -30,6 +30,9 @@ character-by-character disregard-shifts + + + diff --git a/xsl/params/section.title.properties.xml b/xsl/params/section.title.properties.xml index 6ed3bac6b..ab849afd5 100644 --- a/xsl/params/section.title.properties.xml +++ b/xsl/params/section.title.properties.xml @@ -25,7 +25,7 @@ 0.8em 1.0em 1.2em - left + start diff --git a/xsl/params/side.float.properties.xml b/xsl/params/side.float.properties.xml index 4821b03d3..0a6d904cc 100644 --- a/xsl/params/side.float.properties.xml +++ b/xsl/params/side.float.properties.xml @@ -17,13 +17,13 @@ 2in - 4pt - 4pt + 4pt + 4pt 2pt 2pt - 0pt - 0pt - left + 0pt + 0pt + start @@ -40,10 +40,10 @@ of the values for a side float. If you do only left or start side floats, you may want to set the -padding-left attribute to zero. +padding-start attribute to zero. If you do only right or end side floats, you may want to set the -padding-right attribute to zero. +padding-end attribute to zero. diff --git a/xsl/params/sidebar.float.type.xml b/xsl/params/sidebar.float.type.xml index be01fe378..8c6a286a0 100644 --- a/xsl/params/sidebar.float.type.xml +++ b/xsl/params/sidebar.float.type.xml @@ -45,20 +45,37 @@ the float appears at the top of the page. On some processors, that may be the next page rather than the current page. + If sidebar.float.type is -left or -start, then -a left side float is used. +left, +then a left side float is used. + + +If sidebar.float.type is +start, +then when the text direction is left-to-right a left side float is used. +When the text direction is right-to-left, a right side float is used. + + + If sidebar.float.type is -right or -end, then -a right side float is used. +right, +then a right side float is used. + + +If sidebar.float.type is +end, +then when the text direction is left-to-right a right side float is used. +When the text direction is right-to-left, a left side float is used. + + + If your XSL-FO processor supports floats positioned on the inside or diff --git a/xsl/params/sidebar.properties.xml b/xsl/params/sidebar.properties.xml index a7242bbc8..fc98ac0cd 100644 --- a/xsl/params/sidebar.properties.xml +++ b/xsl/params/sidebar.properties.xml @@ -20,12 +20,12 @@ 1pt black #DDDDDD - 12pt - 12pt + 12pt + 12pt 6pt 6pt - 0pt - 0pt + 0pt + 0pt