diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2004-01-22 13:29:32 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2004-01-22 13:29:32 +0000 |
| commit | 6d00a75d8d8f601fcbf9bf0588c20400ae0fcf73 (patch) | |
| tree | 2b6455a977b692745f888e95025973bacf7ec81f | |
| parent | b2b4fb2aba26edb4073794fad5ecd8d953484b58 (diff) | |
| download | yelp-6d00a75d8d8f601fcbf9bf0588c20400ae0fcf73.tar.gz | |
- Handling another category that doesn't exist. ~sigh~
* data/toc.xml.in:
- Handling another category that doesn't exist. ~sigh~
* stylesheets/db2html-html.xsl:
- Modification to variablelist rendering.
* stylesheets/db2html-xref.xsl:
- Pull content of ulink from url when there's no content.
* test/testdoc1/testdoc1.xml:
- Test ulink.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | data/toc.xml.in | 1 | ||||
| -rw-r--r-- | stylesheets/db2html-html.xsl | 4 | ||||
| -rw-r--r-- | stylesheets/db2html-xref.xsl | 5 | ||||
| -rw-r--r-- | test/testdoc1/testdoc1.xml | 13 |
5 files changed, 34 insertions, 3 deletions
@@ -1,5 +1,19 @@ 2004-01-22 Shaun McCance <shaunm@gnome.org> + * data/toc.xml.in: + - Handling another category that doesn't exist. ~sigh~ + + * stylesheets/db2html-html.xsl: + - Modification to variablelist rendering. + + * stylesheets/db2html-xref.xsl: + - Pull content of ulink from url when there's no content. + + * test/testdoc1/testdoc1.xml: + - Test ulink. + +2004-01-22 Shaun McCance <shaunm@gnome.org> + * src/yelp-window.c: - Implemented destroy callback to unref stuff I ref. diff --git a/data/toc.xml.in b/data/toc.xml.in index 9207ea1c..9ccd1b1f 100644 --- a/data/toc.xml.in +++ b/data/toc.xml.in @@ -191,6 +191,7 @@ <category>Applications|Utilities|Terminals</category> <category>Applications|Utilities|Text Utilities</category> <category>Applications|Utilities|Other</category> + <category>GNOME|Applications|System Tools</category> <category>GNOME|Utilities</category> </toc> diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl index 7a8a141c..f1ee2ad8 100644 --- a/stylesheets/db2html-html.xsl +++ b/stylesheets/db2html-html.xsl @@ -175,10 +175,12 @@ div[class="table"] { div[class="variablelist"] { margin-top: 0.8em; - margin-left: 1.6em; margin-right: 1.6em; margin-bottom: 0.8em; } +div[class="variablelist"] dd { + margin-left: 1.6em; +} div[class="sidebar"] { border: outset 1px; diff --git a/stylesheets/db2html-xref.xsl b/stylesheets/db2html-xref.xsl index 0e9e0efa..e65036ba 100644 --- a/stylesheets/db2html-xref.xsl +++ b/stylesheets/db2html-xref.xsl @@ -44,8 +44,11 @@ <xsl:when test="$content"> <xsl:copy-of select="$content"/> </xsl:when> - <xsl:otherwise> + <xsl:when test="string-length(normalize-space(*)) != 0"> <xsl:apply-templates/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$url"/> </xsl:otherwise> </xsl:choose> </a> diff --git a/test/testdoc1/testdoc1.xml b/test/testdoc1/testdoc1.xml index ff2e0ae1..c0e174ad 100644 --- a/test/testdoc1/testdoc1.xml +++ b/test/testdoc1/testdoc1.xml @@ -313,6 +313,18 @@ </para> </listitem> </varlistentry> + <varlistentry><term><sgmltag>ulink</sgmltag></term> + <listitem> + <para> + The <sgmltag>ulink</sgmltag> element is used as a general-purpose + hyperlink which addresses its target by a URL. Here is a ghelp + link: <ulink url="ghelp:gnome-feedback"/>. Here is a http link: + <ulink url="http://www.gnome.org"/>. Here is a file link: <ulink + url="file:///home/"/>. And here is a mailto link to <ulink + url="mailto:shaunm@gnome.org">email me</ulink>. + </para> + </listitem> + </varlistentry> <varlistentry><term><sgmltag>xref</sgmltag></term> <listitem> <para> @@ -414,7 +426,6 @@ systemitem token trademark type -ulink userinput varname wordasword |