Added new parameters to support side floats and margin notes.

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 9fe24f8df239a3aee9822344b4fa7800125f6f2f..06e7d4acc38d3942877a46c08316c4bd15cd059b 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -184,7 +184,6 @@
 <!ENTITY xep.extensions SYSTEM "../params/xep.extensions.xml">
 <!ENTITY xep.index.item.properties SYSTEM "../params/xep.index.item.properties.xml">
 <!ENTITY xref.properties SYSTEM "../params/xref.properties.xml">
-<!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml">
 <!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
 <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
 <!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">
@@ -260,7 +259,15 @@
 <!ENTITY subscript.properties SYSTEM "../params/subscript.properties.xml">
 <!ENTITY superscript.properties SYSTEM "../params/superscript.properties.xml">
 <!ENTITY table.table.properties SYSTEM "../params/table.table.properties.xml">
-<!ENTITY side.float.properties SYSTEM "../params/side.float.properties.xml">
-<!ENTITY sidebar.float.type SYSTEM "../params/sidebar.float.type.xml">
 <!ENTITY graphical.admonition.properties SYSTEM "../params/graphical.admonition.properties.xml">
 <!ENTITY nongraphical.admonition.properties SYSTEM "../params/nongraphical.admonition.properties.xml">
+<!ENTITY body.start.indent SYSTEM "../params/body.start.indent.xml">
+<!ENTITY body.end.indent SYSTEM "../params/body.end.indent.xml">
+<!ENTITY sidebar.properties SYSTEM "../params/sidebar.properties.xml">
+<!ENTITY sidebar.title.properties SYSTEM "../params/sidebar.title.properties.xml">
+<!ENTITY sidebar.float.type SYSTEM "../params/sidebar.float.type.xml">
+<!ENTITY sidebar.float.width SYSTEM "../params/sidebar.float.width.xml">
+<!ENTITY margin.note.properties SYSTEM "../params/margin.note.properties.xml">
+<!ENTITY margin.note.title.properties SYSTEM "../params/margin.note.title.properties.xml">
+<!ENTITY margin.note.float.type SYSTEM "../params/margin.note.float.type.xml">
+<!ENTITY margin.note.width SYSTEM "../params/margin.note.width.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 0560b89ab8d3ad155b17091ff52788faf83601f7..827b505d5f1942b9b33cff46508a670a0585898e 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -342,6 +342,8 @@ zero by default, so this is simply the page-master region-left.
 &double.sided;
 &body.margin.bottom;
 &body.margin.top;
+&body.start.indent;
+&body.end.indent;
 &alignment;
 &hyphenate;
 &line-height;
@@ -410,8 +412,13 @@ zero by default, so this is simply the page-master region-left.
 &verbatim.properties;
 &monospace.verbatim.properties;
 &sidebar.properties;
+&sidebar.title.properties;
 &sidebar.float.type;
-&side.float.properties;
+&sidebar.float.width;
+&margin.note.properties;
+&margin.note.title.properties;
+&margin.note.float.type;
+&margin.note.width;
 &component.title.properties;
 &section.title.properties;
 &section.title.level1.properties;
@@ -532,6 +539,8 @@ around all these parameters.</para>
 <src:fragref linkend="body.font.size.frag"/>
 <src:fragref linkend="body.margin.bottom.frag"/>
 <src:fragref linkend="body.margin.top.frag"/>
+<src:fragref linkend="body.start.indent.frag"/>
+<src:fragref linkend="body.end.indent.frag"/>
 <src:fragref linkend="bridgehead.in.toc.frag"/>
 <src:fragref linkend="callout.defaultcolumn.frag"/>
 <src:fragref linkend="callout.graphics.extension.frag"/>
@@ -635,6 +644,10 @@ around all these parameters.</para>
 <src:fragref linkend="make.index.markup.frag"/>
 <src:fragref linkend="make.single.year.ranges.frag"/>
 <src:fragref linkend="make.year.ranges.frag"/>
+<src:fragref linkend="margin.note.properties.frag"/>
+<src:fragref linkend="margin.note.title.properties.frag"/>
+<src:fragref linkend="margin.note.float.type.frag"/>
+<src:fragref linkend="margin.note.width.frag"/>
 <src:fragref linkend="marker.section.level.frag"/>
 <src:fragref linkend="menuchoice.menu.separator.frag"/>
 <src:fragref linkend="menuchoice.separator.frag"/>
@@ -727,8 +740,9 @@ around all these parameters.</para>
 <src:fragref linkend="shade.verbatim.style.frag"/>
 <src:fragref linkend="show.comments.frag"/>
 <src:fragref linkend="sidebar.properties.frag"/>
+<src:fragref linkend="sidebar.title.properties.frag"/>
 <src:fragref linkend="sidebar.float.type.frag"/>
-<src:fragref linkend="side.float.properties.frag"/>
+<src:fragref linkend="sidebar.float.width.frag"/>
 <src:fragref linkend="simplesect.in.toc.frag"/>
 <src:fragref linkend="subscript.properties.frag"/>
 <src:fragref linkend="superscript.properties.frag"/>