Added new email.delimiters.enabled param. If non-zero (the

default), delimiters are generated around e-mail addresses (output
of the email element). If zero, the delimiters are suppressed.

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 8d880613e620635ced5fbae435b413bfe39d0c2e..4812904181cc024c8e028e12f7adcdca5c0c54be 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -912,9 +912,13 @@
   <xsl:call-template name="inline.monoseq">
     <xsl:with-param name="content">
       <fo:inline keep-together.within-line="always" hyphenate="false">
-        <xsl:text>&lt;</xsl:text>
+        <xsl:if test="not($email.delimiters.enabled = 0)">
+          <xsl:text>&lt;</xsl:text>
+        </xsl:if>
         <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
+        <xsl:if test="not($email.delimiters.enabled = 0)">
+          <xsl:text>&gt;</xsl:text>
+        </xsl:if>
       </fo:inline>
     </xsl:with-param>
   </xsl:call-template>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index c97f8528836aadea12b4d00486c40cfeffbcad20..a678eaa2d93e5291d433326c675ccffa008c244b 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -50,6 +50,7 @@
 <!ENTITY double.sided SYSTEM "../params/double.sided.xml">
 <!ENTITY draft.mode SYSTEM "../params/draft.mode.xml">
 <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml">
+<!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml">
 <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml">
 <!ENTITY footer.rule SYSTEM "../params/footer.rule.xml">
 <!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index d49a60985d156877e1490966d711651bf1b4ef21..e5eb9a53808f24c32d89dd57d0ad7d4faaf79c50 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -283,6 +283,7 @@ generate.section.toc.level;
 &pgwide.properties;
 &highlight.source;
 &highlight.default.language;
+&email.delimiters.enabled;
 </reference>
 
 <reference id="graphics"><title>Graphics</title>
@@ -623,6 +624,7 @@ around all these parameters.</para>
 <src:fragref linkend="draft.watermark.image.frag"/>
 <src:fragref linkend="ebnf.assignment.frag"/>
 <src:fragref linkend="ebnf.statement.terminator.frag"/>
+<src:fragref linkend="email.delimiters.enabled.frag"/>
 <src:fragref linkend="equation.properties.frag"/>
 <src:fragref linkend="example.properties.frag"/>
 <src:fragref linkend="figure.properties.frag"/>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index ef872f278eac476a9714c63fd0b193473e900342..1396dc42bcee09928e036ef88137cfac7516871e 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -27,7 +27,6 @@
      and other information.
 
      ******************************************************************** -->
-
 <xsl:template name="simple.xlink">
   <xsl:param name="node" select="."/>
   <xsl:param name="content">
@@ -1028,12 +1027,16 @@
 <xsl:template match="email">
   <xsl:call-template name="inline.monoseq">
     <xsl:with-param name="content">
-      <xsl:text>&lt;</xsl:text>
+      <xsl:if test="not($email.delimiters.enabled = 0)">
+        <xsl:text>&lt;</xsl:text>
+      </xsl:if>
       <a>
        <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
        <xsl:apply-templates/>
       </a>
-      <xsl:text>&gt;</xsl:text>
+      <xsl:if test="not($email.delimiters.enabled = 0)">
+        <xsl:text>&gt;</xsl:text>
+      </xsl:if>
     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index c75233fb7bb09e146c881df82c9e7ba546637eb2..6abba9ebb6e43464a0714c9bc118d80c2a899b0c 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -47,6 +47,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 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">
 <!ENTITY footer.rule SYSTEM "../params/footer.rule.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index ffc72ba91bd2bdaf71624f97908959ccec314f86..6cbdb502ead12edbc24f11161e6c989c686f9078 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -287,6 +287,7 @@ stylesheet like this:</para>
 &table.footnote.number.symbols;
 &highlight.source;
 &highlight.default.language;
+&email.delimiters.enabled;
 </reference>
 
 <reference id="annos"><title>Annotations</title>
@@ -512,6 +513,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="email.delimiters.enabled.frag"/>
 <src:fragref linkend="emphasis.propagates.style.frag"/>
 <src:fragref linkend="entry.propagates.style.frag"/>
 <src:fragref linkend="firstterm.only.link.frag"/>

diff --git a/xsl/manpages/param.ent b/xsl/manpages/param.ent
index 3c7fc8ab3d19a271f1a188fdd41dbf6b86a3afe6..28792abb6f1554defb4d958dbfa890eb2e6649b5 100644 (file)
--- a/xsl/manpages/param.ent
+++ b/xsl/manpages/param.ent
@@ -54,3 +54,4 @@
 <!ENTITY man.font.funcsynopsisinfo SYSTEM "../params/man.font.funcsynopsisinfo.xml">
 <!ENTITY man.font.table.headings SYSTEM "../params/man.font.table.headings.xml">
 <!ENTITY man.font.table.title SYSTEM "../params/man.font.table.title.xml">
+<!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml">

diff --git a/xsl/manpages/param.xweb b/xsl/manpages/param.xweb
index 89bc26ba28196b48d9ca0bd6edda96498542db81..5f461ce0594f06529c0801dbd555231ab7c0971f 100644 (file)
--- a/xsl/manpages/param.xweb
+++ b/xsl/manpages/param.xweb
@@ -113,6 +113,7 @@
 &man.table.footnotes.divider;
 &man.subheading.divider.enabled;
 &man.subheading.divider;
+&email.delimiters.enabled;
   </reference>
   <appendix id="stylesheet">
     <title>The Stylesheet</title>
@@ -193,6 +194,7 @@
 <src:fragref linkend="man.th.extra1.suppress.frag"/>
 <src:fragref linkend="man.th.extra2.suppress.frag"/>
 <src:fragref linkend="man.th.extra3.suppress.frag"/>
+<src:fragref linkend="email.delimiters.enabled.frag"/>
 </xsl:stylesheet>
     </src:fragment>
 

diff --git a/xsl/params/email.delimiters.enabled.xml b/xsl/params/email.delimiters.enabled.xml
new file mode 100644 (file)
index 0000000..ce90b58
--- /dev/null
+++ b/xsl/params/email.delimiters.enabled.xml
@@ -0,0 +1,23 @@
+<refentry id="email.delimiters.enabled">
+<refmeta>
+<refentrytitle>email.delimiters.enabled</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>email.delimiters.enabled</refname>
+<refpurpose>Generate delimiters around email addresses?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='email.delimiters.enabled.frag'><xsl:param name="email.delimiters.enabled">1</xsl:param></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero, delimiters<footnote><para>For delimiters, the
+stylesheets are currently hard-coded to output angle
+brackets.</para></footnote> are generated around e-mail addresses
+(the output of the <sgmltag>email</sgmltag> element).</para>
+
+</refsect1>
+</refentry>