Added support for the reference.autolabel param in (X)HTML and FO

output.

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index a678eaa2d93e5291d433326c675ccffa008c244b..22dc361a9efd35a3cd7b48bd8864b7ac8a27396f 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -312,3 +312,4 @@
 <!ENTITY ulink.hyphenate.chars SYSTEM "../params/ulink.hyphenate.chars.xml">
 <!ENTITY insert.link.page.number SYSTEM "../params/insert.link.page.number.xml">
 <!ENTITY index.method SYSTEM "../params/index.method.xml">
+<!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index b33ab20f9e17b02c88beaabb83ee53557f46b152..06e71a2e2f5beca9948fd81add95d9f90c5f714c 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -138,6 +138,7 @@ generate.section.toc.level;
 &appendix.autolabel;
 &chapter.autolabel;
 &part.autolabel;
+&reference.autolabel;
 &preface.autolabel;
 &section.autolabel;
 &section.autolabel.max.depth;
@@ -300,21 +301,24 @@ generate.section.toc.level;
 <partintro id="margins_partintro">
 <section id="margins_intro"><title>Understanding XSL FO Margins</title>
 
-<para>In order for the parameters in this section to make sense, it is useful to
+<para>To make sense of the parameters in this section, it's useful to
 consider <xref linkend="fig.pagemodel"/>.</para>
 
 <figure id="fig.pagemodel">
   <title>Page Model</title>
-<mediaobject>
-<imageobject>
-<imagedata fileref="page.png"/>
-</imageobject>
-<textobject><phrase>Figure showing page margins</phrase></textobject>
-<textobject>
-<para>This figure shows the physical page with the various FO page regions
-identified.</para>
-</textobject>
-</mediaobject>
+  <mediaobject>
+    <imageobject role="html">
+      <imagedata fileref="page.png"/>
+    </imageobject>
+    <imageobject role="fo">
+      <imagedata fileref="../doc/fo/page.png"/>
+    </imageobject>
+    <textobject><phrase>Figure showing page margins</phrase></textobject>
+    <textobject>
+      <para>This figure shows the physical page with the various FO page regions
+      identified.</para>
+    </textobject>
+  </mediaobject>
 </figure>
 
 <para>First, let's consider the regions on the page.</para>
@@ -780,6 +784,7 @@ around all these parameters.</para>
 <src:fragref linkend="refentry.pagebreak.frag"/>
 <src:fragref linkend="refentry.title.properties.frag"/>
 <src:fragref linkend="refentry.xref.manvolnum.frag"/>
+<src:fragref linkend="reference.autolabel.frag"/>
 <src:fragref linkend="refclass.suppress.frag"/>
 <src:fragref linkend="region.after.extent.frag"/>
 <src:fragref linkend="region.before.extent.frag"/>

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 2af9a65eb8dc9aa0b8fcf9836632590cfa0e625e..7611a899ce59554d8c10b88581d054be444f1258 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -297,3 +297,4 @@
 <!ENTITY keep.relative.image.uris SYSTEM "../params/keep.relative.image.uris.xml">
 <!ENTITY id.warnings SYSTEM "../params/id.warnings.xml">
 <!ENTITY index.method SYSTEM "../params/index.method.xml">
+<!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index ea2134d5ed2b755402705b022fa9b579b736fc6b..eadfc0c72361a06939b32699e28f00a055a329bc 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -121,6 +121,7 @@ stylesheet like this:</para>
 &chapter.autolabel;
 &appendix.autolabel;
 &part.autolabel;
+&reference.autolabel;
 &preface.autolabel;
 &qandadiv.autolabel;
 &section.autolabel;
@@ -695,6 +696,7 @@ around all these parameters.</para>
 <src:fragref linkend="refentry.generate.title.frag"/>
 <src:fragref linkend="refentry.separator.frag"/>
 <src:fragref linkend="refentry.xref.manvolnum.frag"/>
+<src:fragref linkend="reference.autolabel.frag"/>
 <src:fragref linkend="refclass.suppress.frag"/>
 <src:fragref linkend="root.filename.frag"/>
 <src:fragref linkend="rootid.frag"/>