From aa597e2a672698bb203a44ac74e31cc952c8c281 Mon Sep 17 00:00:00 2001 From: Bob Stayton Date: Wed, 23 Nov 2011 22:29:23 +0000 Subject: [PATCH] Add support for side body margins and side static content regions. Fixes bug 3389931. --- xsl/fo/pagesetup.xsl | 866 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 856 insertions(+), 10 deletions(-) diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl index 9c96bc1f9..8cd845e08 100644 --- a/xsl/fo/pagesetup.xsl +++ b/xsl/fo/pagesetup.xsl @@ -29,16 +29,32 @@ - + + - - - - - - - - - + true + false + + + + + + true + false + + + + + + false + true + + + + + + false + true @@ -67,16 +83,32 @@ + + + + + + blank-body + precedence="{$region.after.precedence}" + display-align="after"/> + + blank + blank + + + blank + blank + @@ -103,13 +135,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.titlepage}" column-count="{$column.count.titlepage}"> + + + + + + + + first + titlepage + + + first + titlepage + + + + + + + + + odd + titlepage + + + odd + titlepage + + + + + + + + + even + titlepage + + + even + titlepage + @@ -200,13 +280,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.lot}" column-count="{$column.count.lot}"> + + + + + + + + first + lot + + + first + lot + + + + + + + + + odd + lot + + + odd + lot + + + + + + + + + even + lot + + + even + lot + @@ -297,13 +425,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.front}" column-count="{$column.count.front}"> + + + + + + + + first + front + + + first + front + + + + + + + + + odd + front + + + odd + front + + + + + + + + + even + front + + + even + front + @@ -397,13 +573,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.body}" column-count="{$column.count.body}"> + + + + + + + + first + body + + + first + body + + + + + + + + + body + odd + + + body + odd + + + + + + + + + body + even + + + body + even + @@ -494,13 +718,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.back}" column-count="{$column.count.back}"> + + + + + + + + first + back + + + first + back + + + + + + + + + odd + back + + + odd + back + + + + + + + + + even + back + + + even + back + @@ -591,13 +863,29 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.index}" column-count="{$column.count.index}"> + + + + + + + + first + index + + + first + index + + + + + + + + + odd + index + + + odd + index + + + + + + + + + even + index + + + even + index + @@ -687,6 +1007,12 @@ + + + + + + @@ -701,10 +1027,20 @@ + + blank + blank + + + blank + blank + @@ -731,6 +1067,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.titlepage}" column-count="{$column.count.titlepage}"> + + + + + + @@ -745,10 +1087,20 @@ + + first + titlepage + + + first + titlepage + + + + + + + @@ -788,10 +1146,20 @@ + + odd + titlepage + + + odd + titlepage + + + + + + + @@ -831,10 +1205,20 @@ + + even + titlepage + + + even + titlepage + @@ -861,6 +1245,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.lot}" column-count="{$column.count.lot}"> + + + + + + @@ -875,10 +1265,20 @@ + + first + lot + + + first + lot + + + + + + + @@ -918,10 +1324,20 @@ + + odd + lot + + + odd + lot + + + + + + + @@ -961,10 +1383,20 @@ + + even + lot + + + even + lot + @@ -991,6 +1423,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.front}" column-count="{$column.count.front}"> + + + + + + @@ -1005,10 +1443,20 @@ + + first + front + + + first + front + + + + + + + @@ -1048,10 +1502,20 @@ + + odd + front + + + odd + front + + + + + + + @@ -1091,10 +1561,20 @@ + + even + front + + + even + front + @@ -1121,6 +1601,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.body}" column-count="{$column.count.body}"> + + + + + + @@ -1135,10 +1621,20 @@ + + first + body + + + first + body + + + + + + + @@ -1178,10 +1680,20 @@ + + odd + body + + + odd + body + + + + + + + @@ -1221,10 +1739,20 @@ + + even + body + + + even + body + @@ -1251,6 +1779,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.back}" column-count="{$column.count.back}"> + + + + + + @@ -1265,10 +1799,20 @@ + + first + back + + + first + back + + + + + + + @@ -1308,10 +1858,20 @@ + + odd + back + + + odd + back + + + + + + + @@ -1351,10 +1917,20 @@ + + even + back + + + even + back + @@ -1381,6 +1957,12 @@ margin-top="{$body.margin.top}" column-gap="{$column.gap.index}" column-count="{$column.count.index}"> + + + + + + @@ -1395,10 +1977,20 @@ + + first + index + + + first + index + + + + + + + @@ -1438,10 +2036,20 @@ + + odd + index + + + odd + index + + + + + + + @@ -1481,10 +2095,20 @@ + + even + index + + + even + index + @@ -1896,6 +2520,17 @@ + + + + + + + + + + + @@ -1912,6 +2547,10 @@ + + + + @@ -2465,6 +3104,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2598,4 +3370,78 @@ + + + blank + blank + + + + + + xsl-region-inner- + + + + + + + + + + + + + + xsl-region-inner- + + + + + + + + + + + + + + + + blank + blank + + + + + + xsl-region-outer- + + + + + + + + + + + + + + xsl-region-outer- + + + + + + + + + + + + + -- 2.40.0