diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2004-02-18 21:22:22 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2004-02-18 21:22:22 +0000 |
| commit | 996f5edd503a8180ed58270809cab4f1a0fb6d76 (patch) | |
| tree | 068a8a2beb20facb18779f7ea5df040b5ff4405b | |
| parent | 97322a068f520b39f7d3d5a257650994f8afe286 (diff) | |
| download | yelp-996f5edd503a8180ed58270809cab4f1a0fb6d76.tar.gz | |
- Added support address/email in titlepage, per #134769. Also don't
* stylesheets/db2html-titlepage.xsl:
* test/testdoc1/testdoc1.xml:
- Added support address/email in titlepage, per #134769. Also don't
duplicate then name of othercredit.
- Merged templates for author | editor | othercredit, since they're
all the same.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | stylesheets/db2html-titlepage.xsl | 42 | ||||
| -rw-r--r-- | test/testdoc1/testdoc1.xml | 12 |
3 files changed, 25 insertions, 38 deletions
@@ -1,3 +1,12 @@ +2004-02-18 Shaun McCance <shaunm@gnome.org> + + * stylesheets/db2html-titlepage.xsl: + * test/testdoc1/testdoc1.xml: + - Added support address/email in titlepage, per #134769. Also don't + duplicate then name of othercredit. + - Merged templates for author | editor | othercredit, since they're + all the same. + 2004-02-17 Shaun McCance <shaunm@gnome.org> * src/yelp-db-pager.c: diff --git a/stylesheets/db2html-titlepage.xsl b/stylesheets/db2html-titlepage.xsl index 59d27a30..7daa8b2c 100644 --- a/stylesheets/db2html-titlepage.xsl +++ b/stylesheets/db2html-titlepage.xsl @@ -149,7 +149,8 @@ </span> </xsl:template> -<xsl:template match="author" mode="titlepage.mode"> +<xsl:template mode="titlepage.mode" + match="author | editor | othercredit"> <dt><xsl:call-template name="person.name"/></dt> <xsl:for-each select="affiliation/orgname"> <dd> @@ -162,14 +163,14 @@ <xsl:apply-templates select="." mode="titlepage.mode"/> </dd> </xsl:for-each> - <xsl:for-each select="email"> + <xsl:for-each select="email | address/email"> <dd> - <strong> + <i> <xsl:call-template name="gettext"> <xsl:with-param name="msgid" select="'Email'"/> </xsl:call-template> <xsl:text>: </xsl:text> - </strong> + </i> <xsl:apply-templates select="." mode="titlepage.mode"/> </dd> </xsl:for-each> @@ -233,22 +234,6 @@ <dt><xsl:apply-templates mode="titlepage.mode"/></dt> </xsl:template> -<xsl:template match="editor" mode="titlepage.mode"> - <dt><xsl:call-template name="person.name"/></dt> - <xsl:for-each select="email"> - <dd> - <strong> - <xsl:call-template name="gettext"> - <xsl:with-param name="msgid" select="'Email'"/> - </xsl:call-template> - <xsl:text>: </xsl:text> - </strong> - <xsl:apply-templates select="." mode="titlepage.mode"/> - </dd> - </xsl:for-each> - <xsl:apply-templates select="personblurb"/> -</xsl:template> - <xsl:template match="holder" mode="titlepage.mode"> <xsl:apply-templates/> </xsl:template> @@ -284,23 +269,6 @@ </h2> </xsl:template> -<xsl:template match="othercredit" mode="titlepage.mode"> - <dt><xsl:call-template name="person.name"/></dt> - <dt><xsl:call-template name="person.name"/></dt> - <xsl:for-each select="email"> - <dd> - <strong> - <xsl:call-template name="gettext"> - <xsl:with-param name="msgid" select="'Email'"/> - </xsl:call-template> - <xsl:text>: </xsl:text> - </strong> - <xsl:apply-templates select="." mode="titlepage.mode"/> - </dd> - </xsl:for-each> - <xsl:apply-templates select="personblurb"/> -</xsl:template> - <xsl:template match="personblurb" mode="titlepage.mode"> <dd><xsl:apply-templates mode="titlepage.mode"/></dd> </xsl:template> diff --git a/test/testdoc1/testdoc1.xml b/test/testdoc1/testdoc1.xml index 9d31fcf3..68230d97 100644 --- a/test/testdoc1/testdoc1.xml +++ b/test/testdoc1/testdoc1.xml @@ -28,10 +28,20 @@ <affiliation> <orgname>GNOME Documentation Project</orgname> <address><email>shaunm@gnome.org</email></address> - </affiliation> + </affiliation> + <email>shaunm@gnome.org</email> </author> </authorgroup> + <othercredit> + <firstname>Shaun</firstname> + <othername>W</othername> + <surname>McCance</surname> + <address> + <email>shaunm@gnome.org</email> + </address> + </othercredit> + <revhistory> <revision> <revnumber> |