Added several new HTML parameters for controlling appearance of

content on HTML title pages:

contrib.inline.enabled:
  If non-zero (the default), output of the contrib element is
  displayed as inline content rather than as block content.

othercredit.like.author.enabled:
  If non-zero, output of the othercredit element on titlepages is
  displayed in the same style as author and editor output. If zero
  (the default), othercredit output is displayed using a style
  different than that of author and editor.

blurb.on.titlepage.enabled:
  If non-zero, output from authorblurb and personblurb elements is
  displayed on title pages. If zero (the default), output from
  those elements is suppressed on title pages (unless you are
  using a titlepage customization that causes them to be included).

editedby.enabled
  If non-zero (the default), a localized Edited by heading is
  displayed above editor names in output of the editor element.

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 6abba9ebb6e43464a0714c9bc118d80c2a899b0c..2af9a65eb8dc9aa0b8fcf9836632590cfa0e625e 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -11,6 +11,7 @@
 <!ENTITY base.dir SYSTEM "../params/base.dir.xml">
 <!ENTITY biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml">
 <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml">
+<!ENTITY blurb.on.titlepage.enabled SYSTEM "../params/blurb.on.titlepage.enabled.xml">
 <!ENTITY bridgehead.in.toc SYSTEM "../params/bridgehead.in.toc.xml">
 <!ENTITY callout.defaultcolumn SYSTEM "../params/callout.defaultcolumn.xml">
 <!ENTITY callout.graphics SYSTEM "../params/callout.graphics.xml">
@@ -39,6 +40,7 @@
 <!ENTITY chunker.output.standalone SYSTEM "../params/chunker.output.standalone.xml">
 <!ENTITY citerefentry.link SYSTEM "../params/citerefentry.link.xml">
 <!ENTITY collect.xref.targets SYSTEM "../params/collect.xref.targets.xml">
+<!ENTITY contrib.inline.enabled SYSTEM "../params/contrib.inline.enabled.xml">
 <!ENTITY css.decoration SYSTEM "../params/css.decoration.xml">
 <!ENTITY current.docid SYSTEM "../params/current.docid.xml">
 <!ENTITY default.table.width SYSTEM "../params/default.table.width.xml">
@@ -47,6 +49,7 @@
 <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml">
 <!ENTITY ebnf.table.bgcolor SYSTEM "../params/ebnf.table.bgcolor.xml">
 <!ENTITY ebnf.table.border SYSTEM "../params/ebnf.table.border.xml">
+<!ENTITY editedby.enabled SYSTEM "../params/editedby.enabled.xml">
 <!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml">
 <!ENTITY emphasis.propagates.style SYSTEM "../params/emphasis.propagates.style.xml">
 <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml">
@@ -170,6 +173,7 @@
 <!ENTITY olink.pubid SYSTEM "../params/olink.pubid.xml">
 <!ENTITY olink.resolver SYSTEM "../params/olink.resolver.xml">
 <!ENTITY olink.sysid SYSTEM "../params/olink.sysid.xml">
+<!ENTITY othercredit.like.author.enabled SYSTEM "../params/othercredit.like.author.enabled.xml">
 <!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml">
 <!ENTITY phrase.propagates.style SYSTEM "../params/phrase.propagates.style.xml">
 <!ENTITY pixels.per.inch SYSTEM "../params/pixels.per.inch.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 6cbdb502ead12edbc24f11161e6c989c686f9078..91f593d6335ffe3e78659b133c8861a3c4d9e876 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -165,11 +165,15 @@ stylesheet like this:</para>
 &id.warnings;
 </reference>
 
-<reference id="meta"><title>Meta/*Info</title>
+<reference id="meta"><title>Meta/*Info and Titlepages</title>
 &inherit.keywords;
 &make.single.year.ranges;
 &make.year.ranges;
 &author.othername.in.middle;
+&blurb.on.titlepage.enabled;
+&contrib.inline.enabled;
+&editedby.enabled;
+&othercredit.like.author.enabled;
 &generate.legalnotice.link;
 &generate.revhistory.link;
 &html.head.legalnotice.link.types;
@@ -475,6 +479,7 @@ around all these parameters.</para>
 <src:fragref linkend="biblioentry.item.separator.frag"/>
 <src:fragref linkend="bibliography.collection.frag"/>
 <src:fragref linkend="bibliography.numbered.frag"/>
+<src:fragref linkend="blurb.on.titlepage.enabled.frag"/>
 <src:fragref linkend="bridgehead.in.toc.frag"/>
 <src:fragref linkend="callout.defaultcolumn.frag"/>
 <src:fragref linkend="callout.graphics.extension.frag"/>
@@ -497,6 +502,7 @@ around all these parameters.</para>
 <src:fragref linkend="citerefentry.link.frag"/>
 <src:fragref linkend="collect.xref.targets.frag"/>
 <src:fragref linkend="component.label.includes.part.label.frag"/>
+<src:fragref linkend="contrib.inline.enabled.frag"/>
 <src:fragref linkend="css.decoration.frag"/>
 <src:fragref linkend="current.docid.frag"/>
 <src:fragref linkend="default.float.class.frag"/>
@@ -513,6 +519,7 @@ around all these parameters.</para>
 <src:fragref linkend="eclipse.plugin.name.frag"/>
 <src:fragref linkend="eclipse.plugin.id.frag"/>
 <src:fragref linkend="eclipse.plugin.provider.frag"/>
+<src:fragref linkend="editedby.enabled.frag"/>
 <src:fragref linkend="email.delimiters.enabled.frag"/>
 <src:fragref linkend="emphasis.propagates.style.frag"/>
 <src:fragref linkend="entry.propagates.style.frag"/>
@@ -655,6 +662,7 @@ around all these parameters.</para>
 <src:fragref linkend="olink.pubid.frag"/>
 <src:fragref linkend="olink.resolver.frag"/>
 <src:fragref linkend="olink.sysid.frag"/>
+<src:fragref linkend="othercredit.like.author.enabled.frag"/>
 <src:fragref linkend="para.propagates.style.frag"/>
 <src:fragref linkend="part.autolabel.frag"/>
 <src:fragref linkend="phrase.propagates.style.frag"/>

diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index c52c098257176e9b8628e385102d8d82b843a3ce..998d7de84e6850a4fad240dcafa06085f2fe7271 100644 (file)
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -189,12 +189,33 @@
   </span>
 </xsl:template>
 
-<xsl:template match="author" mode="titlepage.mode">
+<xsl:template match="author|editor" mode="titlepage.mode">
+  <xsl:call-template name="credits.div"/>
+</xsl:template>
+
+<xsl:template name="credits.div">
   <div class="{name(.)}">
+    <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)">
+      <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4>
+    </xsl:if>
     <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3>
-    <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+    <xsl:if test="not($contrib.inline.enabled = 0)">
+      <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+    </xsl:if>
     <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
     <xsl:apply-templates mode="titlepage.mode" select="./email"/>
+    <xsl:if test="not($blurb.on.titlepage.enabled = 0)">
+      <xsl:choose>
+        <xsl:when test="$contrib.inline.enabled = 0">
+          <xsl:apply-templates mode="titlepage.mode"
+                               select="./contrib|./authorblurb|./personblurb"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates mode="titlepage.mode"
+                               select="./authorblurb|./personblurb"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
   </div>
 </xsl:template>
 
@@ -284,9 +305,18 @@
 </xsl:template>
 
 <xsl:template match="contrib" mode="titlepage.mode">
-  <span class="{name(.)}">
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </span>
+  <xsl:choose>
+    <xsl:when test="not($contrib.inline.enabled = 0)">
+      <span class="{name(.)}">
+        <xsl:apply-templates mode="titlepage.mode"/>
+      </span>
+    </xsl:when>
+    <xsl:otherwise>
+      <div class="{name(.)}">
+        <p><xsl:apply-templates mode="titlepage.mode"/></p>
+      </div>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="copyright" mode="titlepage.mode">
@@ -376,15 +406,6 @@
   </p>
 </xsl:template>
 
-<xsl:template match="editor" mode="titlepage.mode">
-  <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3>
-</xsl:template>
-
-<xsl:template match="editor[position()=1]" mode="titlepage.mode">
-  <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4>
-  <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3>
-</xsl:template>
-
 <xsl:template match="email" mode="titlepage.mode">
   <!-- use the normal e-mail handling code -->
   <xsl:apply-templates select="."/>
@@ -541,6 +562,8 @@
 </xsl:template>
 
 <xsl:template match="othercredit" mode="titlepage.mode">
+<xsl:choose>
+  <xsl:when test="not($othercredit.like.author.enabled = 0)">
   <xsl:variable name="contrib" select="string(contrib)"/>
   <xsl:choose>
     <xsl:when test="contrib">
@@ -567,6 +590,11 @@
       <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
     </xsl:otherwise>
   </xsl:choose>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:call-template name="credits.div"/>
+  </xsl:otherwise>
+</xsl:choose>
 </xsl:template>
 
 <xsl:template match="othercredit" mode="titlepage.othercredits">

diff --git a/xsl/params/blurb.on.titlepage.enabled.xml b/xsl/params/blurb.on.titlepage.enabled.xml
new file mode 100644 (file)
index 0000000..2a77e95
--- /dev/null
+++ b/xsl/params/blurb.on.titlepage.enabled.xml
@@ -0,0 +1,24 @@
+<refentry id="blurb.on.titlepage.enabled">
+<refmeta>
+<refentrytitle>blurb.on.titlepage.enabled</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>blurb.on.titlepage.enabled</refname>
+<refpurpose>Display personblurb and authorblurb on title pages?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='blurb.on.titlepage.enabled.frag'><xsl:param name="blurb.on.titlepage.enabled">0</xsl:param></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero, output from <sgmltag>authorblurb</sgmltag> and
+<sgmltag>personblurb</sgmltag> elements is displayed on title
+pages. If zero (the default), output from those elements is suppressed
+on title pages (unless you are using a titlepage customization that
+causes them to be included).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/contrib.inline.enabled.xml b/xsl/params/contrib.inline.enabled.xml
new file mode 100644 (file)
index 0000000..be74d45
--- /dev/null
+++ b/xsl/params/contrib.inline.enabled.xml
@@ -0,0 +1,21 @@
+<refentry id="contrib.inline.enabled">
+<refmeta>
+<refentrytitle>contrib.inline.enabled</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>contrib.inline.enabled</refname>
+<refpurpose>Display contrib output inline?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='contrib.inline.enabled.frag'><xsl:param name="contrib.inline.enabled">1</xsl:param></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero (the default), output of the <sgmltag>contrib</sgmltag> element is
+displayed as inline content rather than as block content.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/editedby.enabled.xml b/xsl/params/editedby.enabled.xml
new file mode 100644 (file)
index 0000000..5419ed6
--- /dev/null
+++ b/xsl/params/editedby.enabled.xml
@@ -0,0 +1,22 @@
+cxb<refentry id="editedby.enabled">
+<refmeta>
+<refentrytitle>editedby.enabled</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>editedby.enabled</refname>
+<refpurpose>Display “Edited by” heading above editor name?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='editedby.enabled.frag'><xsl:param name="editedby.enabled">1</xsl:param></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero (the default), a localized <emphasis
+role="bold">Edited by</emphasis> heading is displayed above editor
+names in output of the <sgmltag>editor</sgmltag> element.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/othercredit.like.author.enabled.xml b/xsl/params/othercredit.like.author.enabled.xml
new file mode 100644 (file)
index 0000000..d757d0b
--- /dev/null
+++ b/xsl/params/othercredit.like.author.enabled.xml
@@ -0,0 +1,26 @@
+<refentry id="othercredit.like.author.enabled">
+<refmeta>
+<refentrytitle>othercredit.like.author.enabled</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>othercredit.like.author.enabled</refname>
+<refpurpose>Display othercredit in same style as author?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='othercredit.like.author.enabled.frag'><xsl:param name="othercredit.like.author.enabled">0</xsl:param></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero, output of the
+<sgmltag>othercredit</sgmltag> element on titlepages is displayed in
+the same style as <sgmltag>author</sgmltag> and
+<sgmltag>editor</sgmltag> output. If zero (the default),
+<sgmltag>othercredit</sgmltag> output is displayed using a style
+different than that of <sgmltag>author</sgmltag> and
+<sgmltag>editor</sgmltag>.</para>
+
+</refsect1>
+</refentry>