diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2002-07-05 14:41:21 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2002-07-05 14:41:21 +0000 |
| commit | e9e939b8c054ec939d5138d0a596c009d1405cb5 (patch) | |
| tree | 4674ffab4a8aeaa18b77fd100be724115477585a | |
| parent | 9fd98d63ba0a26be1add1356a5a638cfb71430de (diff) | |
| download | libxslt-e9e939b8c054ec939d5138d0a596c009d1405cb5.tar.gz libxslt-e9e939b8c054ec939d5138d0a596c009d1405cb5.tar.bz2 libxslt-e9e939b8c054ec939d5138d0a596c009d1405cb5.zip | |
applied a patch from Ken Neighbors to implement/fix sorting orders cleaned
* libxslt/preproc.c libxslt/xsltutils.c: applied a patch from
Ken Neighbors to implement/fix sorting orders
* tests/docbook/result/*/gdp-handbook.*
tests/docbook/result/xtchunk/html/*.orig
tests/general/bug-12-.out tests/general/bug-63.out:
cleaned up the result of "make tests" following some changes
in namespace axis order and serialization rules in libxml2
Daniel
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libxslt/preproc.c | 4 | ||||
| -rw-r--r-- | libxslt/xsltutils.c | 59 | ||||
| -rw-r--r-- | tests/docbook/result/fo/gdp-handbook.fo | 124 | ||||
| -rw-r--r-- | tests/docbook/result/html/gdp-handbook.html | 108 | ||||
| -rw-r--r-- | tests/docbook/result/xhtml/gdp-handbook.xhtml | 108 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/index.orig | 2 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs02.orig | 20 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs04.orig | 62 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs06.orig | 6 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs07.orig | 4 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs08.orig | 4 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs09.orig | 2 | ||||
| -rw-r--r-- | tests/docbook/result/xtchunk/html/indexs12.orig | 8 | ||||
| -rw-r--r-- | tests/general/bug-12-.out | 2 | ||||
| -rw-r--r-- | tests/general/bug-63.out | 4 |
16 files changed, 298 insertions, 229 deletions
@@ -1,3 +1,13 @@ +Fri Jul 5 16:30:02 CEST 2002 Daniel Veillard <daniel@veillard.com> + + * libxslt/preproc.c libxslt/xsltutils.c: applied a patch from + Ken Neighbors to implement/fix sorting orders + * tests/docbook/result/*/gdp-handbook.* + tests/docbook/result/xtchunk/html/*.orig + tests/general/bug-12-.out tests/general/bug-63.out: + cleaned up the result of "make tests" following some changes + in namespace axis order and serialization rules in libxml2 + Thu Jul 4 16:53:00 HKT 2002 William Brack <wbrack@mmm.com.hk> * transform.c further enhancement for bug 84902 (another diff --git a/libxslt/preproc.c b/libxslt/preproc.c index 6842e322..dc613d8d 100644 --- a/libxslt/preproc.c +++ b/libxslt/preproc.c @@ -316,7 +316,7 @@ xsltSortComp(xsltStylesheetPtr style, xmlNodePtr inst) { xsltPrintErrorContext(NULL, style, inst); xsltGenericError(xsltGenericErrorContext, "xsltSortComp: no support for data-type = %s\n", comp->stype); - comp->number = -1; + comp->number = 0; /* use default */ style->warnings++; } } @@ -332,7 +332,7 @@ xsltSortComp(xsltStylesheetPtr style, xmlNodePtr inst) { xsltPrintErrorContext(NULL, style, inst); xsltGenericError(xsltGenericErrorContext, "xsltSortComp: invalid value %s for order\n", comp->order); - comp->descending = -1; + comp->descending = 0; /* use default */ style->warnings++; } } diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c index 817d76e0..878dcf46 100644 --- a/libxslt/xsltutils.c +++ b/libxslt/xsltutils.c @@ -605,6 +605,7 @@ xsltDoSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, xmlNodePtr node; xmlXPathObjectPtr tmp; xsltStylePreCompPtr comp; + int tempstype[XSLT_MAX_SORT], temporder[XSLT_MAX_SORT]; if ((ctxt == NULL) || (sorts == NULL) || (nbsorts <= 0) || (nbsorts >= XSLT_MAX_SORT)) @@ -619,6 +620,52 @@ xsltDoSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, if ((list == NULL) || (list->nodeNr <= 1)) return; /* nothing to do */ + for (j = 0; j < nbsorts; j++) { + comp = sorts[j]->_private; + tempstype[j] = 0; + if ((comp->stype == NULL) && (comp->has_stype != 0)) { + comp->stype = + xsltEvalAttrValueTemplate(ctxt, sorts[j], + (const xmlChar *) "data-type", + XSLT_NAMESPACE); + if (comp->stype != NULL) { + tempstype[j] = 1; + if (xmlStrEqual(comp->stype, (const xmlChar *) "text")) + comp->number = 0; + else if (xmlStrEqual(comp->stype, (const xmlChar *) "number")) + comp->number = 1; + else { + xsltPrintErrorContext(ctxt, NULL, sorts[j]); + xsltGenericError(xsltGenericErrorContext, + "xsltDoSortFunction: no support for data-type = %s\n", + comp->stype); + comp->number = 0; /* use default */ + } + } + } + temporder[j] = 0; + if ((comp->order == NULL) && (comp->has_order != 0)) { + comp->order = xsltEvalAttrValueTemplate(ctxt, sorts[j], + (const xmlChar *) "order", + XSLT_NAMESPACE); + if (comp->order != NULL) { + temporder[j] = 1; + if (xmlStrEqual(comp->order, (const xmlChar *) "ascending")) + comp->descending = 0; + else if (xmlStrEqual(comp->order, + (const xmlChar *) "descending")) + comp->descending = 1; + else { + xsltPrintErrorContext(ctxt, NULL, sorts[j]); + xsltGenericError(xsltGenericErrorContext, + "xsltDoSortFunction: invalid value %s for order\n", + comp->order); + comp->descending = 0; /* use default */ + } + } + } + } + len = list->nodeNr; resultsTab[0] = xsltComputeSortResult(ctxt, sorts[0]); @@ -627,6 +674,7 @@ xsltDoSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, results = resultsTab[0]; + comp = sorts[0]->_private; descending = comp->descending; number = comp->number; if (results == NULL) @@ -738,6 +786,17 @@ xsltDoSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, } for (j = 0; j < nbsorts; j++) { + comp = sorts[j]->_private; + if (tempstype[j] == 1) { + /* The data-type needs to be recomputed each time */ + xmlFree(comp->stype); + comp->stype = NULL; + } + if (temporder[j] == 1) { + /* The order needs to be recomputed each time */ + xmlFree(comp->order); + comp->order = NULL; + } if (resultsTab[j] != NULL) { for (i = 0;i < len;i++) xmlXPathFreeObject(resultsTab[j][i]); diff --git a/tests/docbook/result/fo/gdp-handbook.fo b/tests/docbook/result/fo/gdp-handbook.fo index 12c084fc..0c3e9f1e 100644 --- a/tests/docbook/result/fo/gdp-handbook.fo +++ b/tests/docbook/result/fo/gdp-handbook.fo @@ -382,7 +382,7 @@ people to make announcements and suggestions and to discuss issues in the comments section. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2778549"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2778187"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that the information in the @@ -409,7 +409,7 @@ source nature of SGML. To contribute to the GDP you should learn to use DocBook. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2778637"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2778273"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To get started writing for the GDP you do not need to rush @@ -490,8 +490,8 @@ DTD's. To install the GDP custom DTD with PNG image support by hand: </fo:block> - <fo:list-block id="id2779050" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2779062" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2778655" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2778666" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -506,7 +506,7 @@ </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2779384" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2778997" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -620,7 +620,7 @@ V1.1//EN"[]> mydocument.sgml</fo:inline>, after which you can print out or view the resulting .ps file. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2779261"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2899056"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> The html files you get will not look quite the same as the @@ -700,8 +700,8 @@ V1.1//EN"[]> The following resources on the web are useful for learning DocBook: </fo:block> - <fo:list-block id="id2901758" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2901756" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2899339" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2899347" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -715,7 +715,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2901811" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2899393" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -728,7 +728,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2901851" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2899433" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -742,7 +742,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2901891" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2899473" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -766,8 +766,8 @@ V1.1//EN"[]> The following sections of this document are designed to help documentation authors write correct and consistent DocBook: </fo:block> - <fo:list-block id="id2901960" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2901957" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2899540" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2899548" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1373,8 +1373,8 @@ V1.1//EN"[]> advised</fo:inline> that the documentation writers conform to XML syntax rules. Here are most important differences: </fo:block> - <fo:list-block id="id2904455" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - <fo:list-item id="id2904462" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2901979" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2901984" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Minimization</fo:inline></fo:inline> @@ -1395,7 +1395,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2904594" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2902116" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Self-closing tags</fo:inline></fo:inline> @@ -1415,7 +1415,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2904676" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2902199" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Case sensitive tags</fo:inline></fo:inline> @@ -1537,7 +1537,7 @@ V1.1//EN"[]> <fo:block id="shot1" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after.minimum="1em" space-after.optimum="1.5em" space-after.maximum="2em" keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Screenshot</fo:block><fo:block><fo:block><fo:external-graphic src="url(file:figures/example_screenshot)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block></fo:block></fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905204"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2902735"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Notice in this example that the screenshot file name does @@ -1599,7 +1599,7 @@ make: *** No rule to make target `love'. Stop. Note the use of tags <fo:inline font-family="Courier"><prompt></fo:inline> and <fo:inline font-family="Courier"><userinput></fo:inline> for marking system prompt and commands entered by user. - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905448"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2902958"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that both <fo:inline font-family="Courier"><programlisting></fo:inline> and <fo:inline font-family="Courier"><screen></fo:inline> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -1623,8 +1623,8 @@ make: *** No rule to make target `love'. Stop. <fo:inline font-family="Courier"><orderedlist></fo:inline>, and <fo:inline font-family="Courier"><variablelist></fo:inline>. </fo:block> - <fo:list-block id="id2905560" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - <fo:list-item id="id2905567" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2903069" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903075" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><itemizedlist></fo:inline></fo:inline> @@ -1663,8 +1663,8 @@ make: *** No rule to make target `love'. Stop. </fo:block> and output: </fo:block> - <fo:list-block id="id2905626" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2905605" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2903131" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2903137" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1676,7 +1676,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2905678" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903185" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1689,7 +1689,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2905710" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903217" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1718,7 +1718,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2905886" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903389" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><orderedlist></fo:inline></fo:inline> @@ -1741,7 +1741,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2905985" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903488" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><variablelist></fo:inline></fo:inline> @@ -1812,8 +1812,8 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:block> </fo:block> - <fo:list-block id="id2906161" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2906167" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2903661" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2903667" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1824,7 +1824,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906193" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903693" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1839,7 +1839,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906242" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903743" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1850,7 +1850,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906268" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903767" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1860,7 +1860,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906292" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903791" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1871,7 +1871,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906317" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2903816" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1951,8 +1951,8 @@ url="http://www.gnome.org">GNOME Web page</ulink> Here are some tags used to describe operating system-related things: </fo:block> - <fo:list-block id="id2906715" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2906721" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2904206" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2904212" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1966,7 +1966,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906776" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904266" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1980,7 +1980,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906837" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904326" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1994,7 +1994,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906892" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904381" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2006,7 +2006,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906933" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904422" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2020,7 +2020,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2906988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904477" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2056,9 +2056,9 @@ url="http://www.gnome.org">GNOME Web page</ulink> other tags for keys, too: <fo:inline font-family="Courier"><keysym></fo:inline> and <fo:inline font-family="Courier"><keycode></fo:inline>. However you are unlikely to need these for most documentation. For reference, - <fo:inline font-family="Courier"><keysym></fo:inline> is for the ‘symbolic - name’ of a key. <fo:inline font-family="Courier"><keycode></fo:inline> is - for the ‘scan code’ of a key. These are not + <fo:inline font-family="Courier"><keysym></fo:inline> is for the “symbolic + name” of a key. <fo:inline font-family="Courier"><keycode></fo:inline> is + for the “scan code” of a key. These are not terms commonly required in GNOME documentation, although <fo:inline font-family="Courier"><keysym></fo:inline> is useful for marking up control codes. @@ -2131,8 +2131,8 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> here is partial list of most commonly used enitites: </fo:block> - <fo:list-block id="id2907459" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2907465" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block id="id2904943" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item id="id2904949" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2142,7 +2142,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2907484" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904968" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2152,7 +2152,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2907503" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2904986" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2162,7 +2162,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2907522" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2905005" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2172,7 +2172,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2907544" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item id="id2905026" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2336,7 +2336,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> PNG format only) when appropriate. They should also describe each feature and preference option available. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908005"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905471"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Documentation Availability</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Applications and applets should not rely on documentation @@ -2352,7 +2352,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> versions 1.x and the templates in <fo:basic-link internal-destination="template2-2x">the section called “Template 2: Applet Manual For GNOME 2.x”</fo:basic-link> for GNOME versions 2.x. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908045"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905564"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Manuals For Large Applications</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Manuals for very large applications, such as GNOME Workshop @@ -2363,7 +2363,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:inline font-family="Courier"><sect1></fo:inline>). </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908160"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905622"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Applet Manuals in GNOME 2.0</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that applet manuals in GNOME 2.0 are treated in a special @@ -2393,7 +2393,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908284"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905742"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2430,7 +2430,7 @@ function-reference.html Gnumeric function reference from SGML into HTML with <fo:inline font-weight="bold">db2html</fo:inline>) should be placed in this directory too. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908474"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2905930"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> If the help files are not present in the correct directory, the @@ -2470,7 +2470,7 @@ GnomeUIInfo helpmenu[] = { </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908643"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2906097"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2502,7 +2502,7 @@ if (tmp) { g_free(tmp); } </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2908781"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2906232"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> The example above is in the C language, please refer to other @@ -2572,7 +2572,7 @@ if (tmp) { </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2909032"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2906480"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2740,7 +2740,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - <fo:list-block id="id2909577" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item id="id2909582" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + <fo:list-block id="id2907018" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item id="id2907025" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Documents should be complete, yet concise. You should describe every feature, but you'll have decide how much detail is really necessary. It's not, for example, @@ -2750,7 +2750,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2909610" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2907052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -2759,14 +2759,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2909649" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2907091" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Examples, tips, notes, and screenshots are useful to break up long stretches of text, but too many can get in the way, and make your documents too choppy to read. It's good to provide a screenshot of any dialog windows a user might run into, but if a dialog box has several tabs, it's not usually necessary to have one for each. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2909673" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2907115" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> The GDP strives to have all of its documentation conform to certain standards of style and content, but every document (and every writer) is different. You will need diff --git a/tests/docbook/result/html/gdp-handbook.html b/tests/docbook/result/html/gdp-handbook.html index 807b8fe2..9306220c 100644 --- a/tests/docbook/result/html/gdp-handbook.html +++ b/tests/docbook/result/html/gdp-handbook.html @@ -83,7 +83,7 @@ irc.gnome.org is another option for contacting GDP members. </p></div></div><div class="sect2"><a name="notation"></a><div class="titlepage"><div><h3 class="title"><a name="notation"></a>Notation and Conventions</h3></div></div><p> This Handbook uses the following notation: - <div class="informaltable" id="id2791779"><a name="id2791779"></a><table border="0"><colgroup><col><col></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> + <div class="informaltable" id="id2797250"><a name="id2797250"></a><table border="0"><colgroup><col><col></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> Directory </td></tr><tr><td><tt>foo.sgml</tt></td><td> Filename @@ -147,7 +147,7 @@ help. The <i>DocTable</i> also allows people to make announcements and suggestions and to discuss issues in the comments section. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787009"></a>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787277"></a>Note</h3><p> Note that the information in the <i>DocTable</i> may not always be up-to-date or accurate. When you assign yourself to documenting an @@ -159,7 +159,7 @@ this for documentation, not least of which is the single source nature of SGML. To contribute to the GDP you should learn to use DocBook. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787085"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787363"></a>NOTE</h3><p> To get started writing for the GDP you do not need to rush out and learn DocBook - if you feel it is too much to handle for now, you can submit plain ASCII text to the <a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top"> @@ -205,14 +205,14 @@ your output document appearance subtly vary between the two DTD's. To install the GDP custom DTD with PNG image support by hand: - </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2787506"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2787765"></a> Download <a href="http://www.labs.redhat.com/png/png-support.html" target="_top">the GDP DocBook DTD for PNG support</a> and install it where you keep your DTD's. (On Red Hat use <tt>/usr/lib/sgml/</tt>.) Note that the 3.0 DTD is missing support for the <tt><legalnotice></tt> tag, so it is recommended that you use version 3.1 - </p></li><li style="list-style-type: disc"><p><a name="id2787673"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2788094"></a> Add the new DTD to your SGML CATALOG file. The location of your SGML CATALOG file may vary depending upon your distribution. (On Red Hat it is usually in @@ -290,7 +290,7 @@ V1.1//EN"[]> the command <tt>$</tt><b>db2ps mydocument.sgml</b>, after which you can print out or view the resulting .ps file. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787595"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2907798"></a>NOTE</h3><p> The html files you get will not look quite the same as the documentation distributed with GNOME unless you have the custom stylesheets installed on your machine. DocBook @@ -341,24 +341,24 @@ V1.1//EN"[]> There are many resources available to help you learn DocBook. The following resources on the web are useful for learning DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2910177"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2908088"></a> <a href="http://www.docbook.org" target="_top">http://www.docbook.org</a> - Norman Walsh's <i>DocBook: The Definitive Guide</i>. Online O'Reilly book on using DocBook. Contains an excellent element reference. May be too formal for a beginner. - </p></li><li style="list-style-type: disc"><p><a name="id2910232"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2908133"></a> <a href="http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html" target="_top">A Practical Introduction to DocBook</a> - The Open Source Writers Group's introduction to using DocBook. This is an excellent HOW-TO type article on getting started. - </p></li><li style="list-style-type: disc"><p><a name="id2910272"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2908173"></a> <a href="http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html" target="_top">Getting Going with DocBook: Notes for Hackers</a> - Mark Galassi's introduction to DocBook for hackers. This has to be one of the first introductions to DocBook ever - still as good as it ever was. - </p></li><li style="list-style-type: disc"><p><a name="id2910312"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2908213"></a> <a href="http://www.freebsd.org/tutorials/docproj-primer/" target="_top"> FreeBSD Documentation Project Primer for New Contributors</a> - FreeBSD documentation project @@ -371,7 +371,7 @@ V1.1//EN"[]> </p><p> The following sections of this document are designed to help documentation authors write correct and consistent DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2910378"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2908289"></a> <a href="#docbookbasics" title="DocBook Basics ">the section called “DocBook Basics ”</a> - Descriptions of commonly used DocBook tags. </p></li></ul></div><p> @@ -709,7 +709,7 @@ V1.1//EN"[]> ready for this transistion, it is <i>strongly advised</i> that the documentation writers conform to XML syntax rules. Here are most important differences: - </p><div class="variablelist"><dl><dt><a name="id2912882"></a><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2912901"></a> + </p><div class="variablelist"><dl><dt><a name="id2910725"></a><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2910743"></a> It is possible with some implementations of SGML to use minimizations to close elements in a document by using </>, for example: @@ -720,7 +720,7 @@ V1.1//EN"[]> if you are using Emacs with psgml mode, you can also use menu command Modify->Normalize. - </p></dd><dt><a name="id2913014"></a><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2913034"></a> + </p></dd><dt><a name="id2910856"></a><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2910876"></a> Also, in SGML some tags are allowed not to have closing tags. For example, it is legal for <tt><xref></tt> not to have a closing tag: @@ -730,7 +730,7 @@ V1.1//EN"[]> <tt><tt><xref linkend="someid"/></tt></tt> (note the slash!). - </p></dd><dt><a name="id2913097"></a><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2913117"></a> + </p></dd><dt><a name="id2910939"></a><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2910958"></a> In XML, unlike SGML, tags are case-senstive <tt><title></tt> and <tt><TITLE></tt> are different tags! @@ -796,7 +796,7 @@ V1.1//EN"[]> actual file name (without extension). The result will look like this: <div class="figure"><p><a name="shot1"></a><b>Figure 1. Screenshot</b></p><div class="screenshot"><p><img src="figures/example_screenshot"></p></div></div> - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2913625"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2911476"></a>NOTE</h3><p> Notice in this example that the screenshot file name does not include the file type extension -- to find out why, please read <a href="#jadeimages" title="Images in DocBook Tools">the section called “Images in DocBook Tools”</a>. @@ -844,7 +844,7 @@ make: *** No rule to make target `love'. Stop. Note the use of tags <tt><prompt></tt> and <tt><userinput></tt> for marking system prompt and commands entered by user. - <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2913870"></a>NOTE</h3><p> + <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2911698"></a>NOTE</h3><p> Note that both <tt><programlisting></tt> and <tt><screen></tt> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -857,7 +857,7 @@ make: *** No rule to make target `love'. Stop. <tt><itemizedlist></tt>, <tt><orderedlist></tt>, and <tt><variablelist></tt>. - </p><div class="variablelist"><dl><dt><a name="id2913989"></a><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2914008"></a> + </p><div class="variablelist"><dl><dt><a name="id2911815"></a><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2911834"></a> This is the simplest unnumbered list, parallel to <tt><ul></tt> in HTML. Here is an example: <pre class="programlisting"> @@ -888,16 +888,16 @@ make: *** No rule to make target `love'. Stop. </pre> and output: - </p><div class="itemizedlist"><ul><li><p><a name="id2914026"></a> + </p><div class="itemizedlist"><ul><li><p><a name="id2911878"></a> Show backup files -- This will show any backup file that might be on your system. - </p></li><li><p><a name="id2914100"></a> + </p></li><li><p><a name="id2911925"></a> Show hidden files -- This will show all "dot files" or files that begin with a dot. This files typically include configuration files and directories. - </p></li><li><p><a name="id2914132"></a> + </p></li><li><p><a name="id2911957"></a> Mix files and directories -- This option will display files and directories in the order you sort them instead @@ -915,7 +915,7 @@ make: *** No rule to make target `love'. Stop. or -- if none of this applies -- use <a href="#gui" title="GUI elements"><tt><emphasis></tt></a>. - </p></dd><dt><a name="id2914308"></a><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2914327"></a> + </p></dd><dt><a name="id2912130"></a><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2912148"></a> This list is completely analogous to <tt><itemizedlist></tt> and has the same syntax, but it produces numbered list. By default, @@ -928,7 +928,7 @@ make: *** No rule to make target `love'. Stop. <tt>loweralpha</tt>, <tt>upperroman</tt>, <tt>lowerroman</tt>. - </p></dd><dt><a name="id2914408"></a><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2914427"></a> This list is used when each entry is + </p></dd><dt><a name="id2912228"></a><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2912247"></a> This list is used when each entry is rather long, so it should be formatted as a block of text with some subtitle, like a small subsection. The <tt><variablelist></tt> is more complicated @@ -969,25 +969,25 @@ make: *** No rule to make target `love'. Stop. are smart enough to change the numeration (for <tt><orderedlist></tt>) or marks of each entry (in <tt><itemizedlist></tt>) for sub-lists - </p></div></div><div class="sect2"><a name="inline"></a><div class="titlepage"><div><h3 class="title"><a name="inline"></a>Inline Elements</h3></div></div><div class="sect3"><a name="gui"></a><div class="titlepage"><div><h4 class="title"><a name="gui"></a>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2914590"></a> + </p></div></div><div class="sect2"><a name="inline"></a><div class="titlepage"><div><h3 class="title"><a name="inline"></a>Inline Elements</h3></div></div><div class="sect3"><a name="gui"></a><div class="titlepage"><div><h4 class="title"><a name="gui"></a>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2912407"></a> <tt><guibutton></tt> -- used for buttons, including checkbuttons and radio buttons - </p></li><li><p><a name="id2914616"></a> + </p></li><li><p><a name="id2912433"></a> <tt><guimenu></tt>, <tt><guisubmenu></tt> --used for top-level menus and submenus respectively, for example <tt> <guisubmenu>Utilities</guisubmenu> submenu of the <guimenu>Main Menu</guimenu></tt> - </p></li><li><p><a name="id2914665"></a> + </p></li><li><p><a name="id2912484"></a> <tt><guimenuitem></tt>--an entry in a menu - </p></li><li><p><a name="id2914691"></a> + </p></li><li><p><a name="id2912507"></a> <tt><guiicon></tt>--an icon - </p></li><li><p><a name="id2914714"></a> + </p></li><li><p><a name="id2912532"></a> <tt><guilabel></tt>--for items which have labels, like tabs, or bounding boxes. - </p></li><li><p><a name="id2914740"></a> + </p></li><li><p><a name="id2912557"></a> <tt><interface></tt>-- for most everything else... a window, a dialog box, the Panel, etc. </p></li></ul></div><p> @@ -1035,35 +1035,35 @@ url="http://www.gnome.org">GNOME Web page</ulink> computer-related things</h4></div></div><p> Here are some tags used to describe operating system-related things: - </p><div class="itemizedlist"><ul><li><p><a name="id2915144"></a> <tt><filename></tt> -- used + </p><div class="itemizedlist"><ul><li><p><a name="id2912952"></a> <tt><filename></tt> -- used for filenames, e.g.<tt><filename></tt> foo.sgml <tt></filename></tt> produces: <tt>foo.sgml</tt>. - </p></li><li><p><a name="id2915199"></a> <tt><filename + </p></li><li><p><a name="id2913007"></a> <tt><filename class="directory"></tt> -- used for directories, e.g.<tt><filename class="directory"></tt>/usr/bin <tt></filename></tt> produces: <tt>/usr/bin</tt>. - </p></li><li><p><a name="id2915260"></a> + </p></li><li><p><a name="id2913067"></a> <tt><application></tt> -- used for application names, e.g. <tt><application></tt>Gnumeric <tt></application></tt> produces: Gnumeric. - </p></li><li><p><a name="id2915315"></a> + </p></li><li><p><a name="id2913121"></a> <tt><envar></tt> -- used for environment variables, e.g. <tt><envar></tt>PATH<tt></envar></tt>. - </p></li><li><p><a name="id2915356"></a> + </p></li><li><p><a name="id2913162"></a> <tt><command></tt> -- used for commands entered on command line, e.g. <tt><command></tt>make install <tt></command></tt> produces: <b>make install</b>. - </p></li><li><p><a name="id2915411"></a> + </p></li><li><p><a name="id2913218"></a> <tt><replaceable></tt> -- used for replaceable text, e.g. <tt><command></tt>db2html<tt><replaceable></tt> @@ -1080,9 +1080,9 @@ url="http://www.gnome.org">GNOME Web page</ulink> other tags for keys, too: <tt><keysym></tt> and <tt><keycode></tt>. However you are unlikely to need these for most documentation. For reference, - <tt><keysym></tt> is for the ‘symbolic - name’ of a key. <tt><keycode></tt> is - for the ‘scan code’ of a key. These are not + <tt><keysym></tt> is for the “symbolic + name” of a key. <tt><keycode></tt> is + for the “scan code” of a key. These are not terms commonly required in GNOME documentation, although <tt><keysym></tt> is useful for marking up control codes. @@ -1131,15 +1131,15 @@ url="http://www.gnome.org">GNOME Web page</ulink> is required. </p><p> here is partial list of most commonly used enitites: - </p><div class="itemizedlist"><ul><li><p><a name="id2915888"></a> + </p><div class="itemizedlist"><ul><li><p><a name="id2913689"></a> <tt>&amp;</tt> -- ampersend (&) - </p></li><li><p><a name="id2915907"></a> + </p></li><li><p><a name="id2913708"></a> <tt>&lt;</tt> -- left angle bracket (<) - </p></li><li><p><a name="id2915926"></a> + </p></li><li><p><a name="id2913727"></a> <tt>&copy;</tt> -- copyright sign (©) - </p></li><li><p><a name="id2915945"></a> + </p></li><li><p><a name="id2913746"></a> <tt>&mdash;</tt> -- long dash (--) - </p></li><li><p><a name="id2915964"></a> + </p></li><li><p><a name="id2913767"></a> <tt>&hellip;</tt> -- ellipsis (...) </p></li></ul></div><p> Note that the actual look of the resulting symbols depends @@ -1194,7 +1194,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> each window or panel presented to the user using screenshots (in PNG format only) when appropriate. They should also describe each feature and preference option available. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916428"></a>Documentation Availability</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914212"></a>Documentation Availability</h3><p> Applications and applets should not rely on documentation which is only available on the internet. All manuals and other documentation should be packaged with the application or @@ -1205,14 +1205,14 @@ url="http://www.gnome.org">GNOME Web page</ulink> the templates in <a href="#template2-1x" title="Template 2: Applet Manual For GNOME 1.x">the section called “Template 2: Applet Manual For GNOME 1.x”</a> for GNOME versions 1.x and the templates in <a href="#template2-2x" title="Template 2: Applet Manual For GNOME 2.x">the section called “Template 2: Applet Manual For GNOME 2.x”</a> for GNOME versions 2.x. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916468"></a>Manuals For Large Applications</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914304"></a>Manuals For Large Applications</h3><p> Manuals for very large applications, such as GNOME Workshop components should be a <tt><book></tt> (and thus use <tt><chapter></tt> for each primary section) , instead of <tt><article></tt> which most applications use(with each primary section being a <tt><sect1></tt>). - </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916583"></a>Applet Manuals in GNOME 2.0</h3><p> + </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914362"></a>Applet Manuals in GNOME 2.0</h3><p> Note that applet manuals in GNOME 2.0 are treated in a special way. The manuals for all applets are merged into a single virtual document by Nautilus. For this reason, the header @@ -1228,7 +1228,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> application, as described in <a href="#listingdocsinhelpmenu" title="Listing Documents in the Help Menu">the section called “Listing Documents in the Help Menu”</a>. Applets should make their manuals available by right-clicking on the applet. - </p></div><div class="sect1"><a name="listingdocsinhelpmenu"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"></a>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916707"></a>Developer Information</h3><p> + </p></div><div class="sect1"><a name="listingdocsinhelpmenu"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"></a>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914482"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1260,7 +1260,7 @@ function-reference.html Gnumeric function reference application's name. The application documentation (converted from SGML into HTML with <b>db2html</b>) should be placed in this directory too. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916897"></a>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914671"></a>Note</h3><p> If the help files are not present in the correct directory, the menu items will NOT appear when the program is run. </p></div><p> @@ -1286,7 +1286,7 @@ GnomeUIInfo helpmenu[] = { Help menu. When the user selects any of these topics from the Help menu, a help browser will be started with the associated HTML documentation. - </p></div><div class="sect1"><a name="applicationhelpbuttons"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"></a>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917066"></a>Developer Information</h3><p> + </p></div><div class="sect1"><a name="applicationhelpbuttons"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"></a>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914837"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1311,7 +1311,7 @@ if (tmp) { gnome_help_goto(0, tmp); g_free(tmp); } - </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917203"></a>NOTE</h3><p> + </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914973"></a>NOTE</h3><p> The example above is in the C language, please refer to other documentation or forums for other GNOME language bindings. </p></div></div><div class="sect1"><a name="packagingappletdocs"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="packagingappletdocs"></a>Packaging Applet Documentation</h2></div></div><div class="sect2"><a name="appletfiles"></a><div class="titlepage"><div><h3 class="title"><a name="appletfiles"></a>Applet Documentation Files</h3></div></div><p> @@ -1348,7 +1348,7 @@ if (tmp) { of the <i>GNOME Applets</i> book, you must remember to add <tt><legalnotice></tt> and <tt><copyright></tt> sections. - </p></div><div class="sect2"><a name="appletmenu"></a><div class="titlepage"><div><h3 class="title"><a name="appletmenu"></a>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917455"></a>Developer Information</h3><p> + </p></div><div class="sect2"><a name="appletmenu"></a><div class="titlepage"><div><h3 class="title"><a name="appletmenu"></a>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2915220"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1453,7 +1453,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", </p></div><div class="sect2"><a name="balance"></a><div class="titlepage"><div><h3 class="title"><a name="balance"></a>Achieving a Balanced Style</h3></div></div><p> Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - <div class="itemizedlist"><ul><li><p><a name="id2918005"></a> + <div class="itemizedlist"><ul><li><p><a name="id2915765"></a> Documents should be complete, yet concise. You should describe every feature, but you'll have decide how much detail is really necessary. It's not, for example, @@ -1463,7 +1463,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - </p></li><li><p><a name="id2918033"></a> + </p></li><li><p><a name="id2915792"></a> Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -1472,14 +1472,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - </p></li><li><p><a name="id2918072"></a> + </p></li><li><p><a name="id2915831"></a> Examples, tips, notes, and screenshots are useful to break up long stretches of text, but too many can get in the way, and make your documents too choppy to read. It's good to provide a screenshot of any dialog windows a user might run into, but if a dialog box has several tabs, it's not usually necessary to have one for each. - </p></li><li><p><a name="id2918096"></a> + </p></li><li><p><a name="id2915855"></a> The GDP strives to have all of its documentation conform to certain standards of style and content, but every document (and every writer) is different. You will need diff --git a/tests/docbook/result/xhtml/gdp-handbook.xhtml b/tests/docbook/result/xhtml/gdp-handbook.xhtml index f94c5549..5d7fa554 100644 --- a/tests/docbook/result/xhtml/gdp-handbook.xhtml +++ b/tests/docbook/result/xhtml/gdp-handbook.xhtml @@ -84,7 +84,7 @@ irc.gnome.org is another option for contacting GDP members. </p></div></div><div class="sect2"><a name="notation"/><div class="titlepage"><div><h3 class="title"><a name="notation"/>Notation and Conventions</h3></div></div><p> This Handbook uses the following notation: - <div class="informaltable" id="id2794857"><a name="id2794857"/><table border="0"><colgroup><col/><col/></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> + <div class="informaltable" id="id2880946"><a name="id2880946"/><table border="0"><colgroup><col/><col/></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> Directory </td></tr><tr><td><tt>foo.sgml</tt></td><td> Filename @@ -148,7 +148,7 @@ help. The <i>DocTable</i> also allows people to make announcements and suggestions and to discuss issues in the comments section. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787506"/>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787350"/>Note</h3><p> Note that the information in the <i>DocTable</i> may not always be up-to-date or accurate. When you assign yourself to documenting an @@ -160,7 +160,7 @@ this for documentation, not least of which is the single source nature of SGML. To contribute to the GDP you should learn to use DocBook. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787594"/>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2787436"/>NOTE</h3><p> To get started writing for the GDP you do not need to rush out and learn DocBook - if you feel it is too much to handle for now, you can submit plain ASCII text to the <a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top"> @@ -206,14 +206,14 @@ your output document appearance subtly vary between the two DTD's. To install the GDP custom DTD with PNG image support by hand: - </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2788018"/> + </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2787838"/> Download <a href="http://www.labs.redhat.com/png/png-support.html" target="_top">the GDP DocBook DTD for PNG support</a> and install it where you keep your DTD's. (On Red Hat use <tt>/usr/lib/sgml/</tt>.) Note that the 3.0 DTD is missing support for the <tt><legalnotice></tt> tag, so it is recommended that you use version 3.1 - </p></li><li style="list-style-type: disc"><p><a name="id2788340"/> + </p></li><li style="list-style-type: disc"><p><a name="id2788168"/> Add the new DTD to your SGML CATALOG file. The location of your SGML CATALOG file may vary depending upon your distribution. (On Red Hat it is usually in @@ -291,7 +291,7 @@ V1.1//EN"[]> the command <tt>$</tt><b>db2ps mydocument.sgml</b>, after which you can print out or view the resulting .ps file. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2788213"/>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2907932"/>NOTE</h3><p> The html files you get will not look quite the same as the documentation distributed with GNOME unless you have the custom stylesheets installed on your machine. DocBook @@ -342,24 +342,24 @@ V1.1//EN"[]> There are many resources available to help you learn DocBook. The following resources on the web are useful for learning DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2910438"/> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2908222"/> <a href="http://www.docbook.org" target="_top">http://www.docbook.org</a> - Norman Walsh's <i>DocBook: The Definitive Guide</i>. Online O'Reilly book on using DocBook. Contains an excellent element reference. May be too formal for a beginner. - </p></li><li style="list-style-type: disc"><p><a name="id2910493"/> + </p></li><li style="list-style-type: disc"><p><a name="id2908268"/> <a href="http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html" target="_top">A Practical Introduction to DocBook</a> - The Open Source Writers Group's introduction to using DocBook. This is an excellent HOW-TO type article on getting started. - </p></li><li style="list-style-type: disc"><p><a name="id2910534"/> + </p></li><li style="list-style-type: disc"><p><a name="id2908308"/> <a href="http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html" target="_top">Getting Going with DocBook: Notes for Hackers</a> - Mark Galassi's introduction to DocBook for hackers. This has to be one of the first introductions to DocBook ever - still as good as it ever was. - </p></li><li style="list-style-type: disc"><p><a name="id2910573"/> + </p></li><li style="list-style-type: disc"><p><a name="id2908348"/> <a href="http://www.freebsd.org/tutorials/docproj-primer/" target="_top"> FreeBSD Documentation Project Primer for New Contributors</a> - FreeBSD documentation project @@ -372,7 +372,7 @@ V1.1//EN"[]> </p><p> The following sections of this document are designed to help documentation authors write correct and consistent DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2910640"/> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2908423"/> <a href="#docbookbasics" title="DocBook Basics ">the section called “DocBook Basics ”</a> - Descriptions of commonly used DocBook tags. </p></li></ul></div><p> @@ -710,7 +710,7 @@ V1.1//EN"[]> ready for this transistion, it is <i>strongly advised</i> that the documentation writers conform to XML syntax rules. Here are most important differences: - </p><div class="variablelist"><dl><dt><a name="id2913144"/><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2913163"/> + </p><div class="variablelist"><dl><dt><a name="id2910860"/><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2910878"/> It is possible with some implementations of SGML to use minimizations to close elements in a document by using </>, for example: @@ -721,7 +721,7 @@ V1.1//EN"[]> if you are using Emacs with psgml mode, you can also use menu command Modify->Normalize. - </p></dd><dt><a name="id2913276"/><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2913295"/> + </p></dd><dt><a name="id2910991"/><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2911010"/> Also, in SGML some tags are allowed not to have closing tags. For example, it is legal for <tt><xref></tt> not to have a closing tag: @@ -731,7 +731,7 @@ V1.1//EN"[]> <tt><tt><xref linkend="someid"/></tt></tt> (note the slash!). - </p></dd><dt><a name="id2913358"/><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2913378"/> + </p></dd><dt><a name="id2911074"/><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2911092"/> In XML, unlike SGML, tags are case-senstive <tt><title></tt> and <tt><TITLE></tt> are different tags! @@ -797,7 +797,7 @@ V1.1//EN"[]> actual file name (without extension). The result will look like this: <div class="figure"><p><a name="shot1"/><b>Figure 1. Screenshot</b></p><div class="screenshot"><p><img src="figures/example_screenshot"/></p></div></div> - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2913886"/>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2911611"/>NOTE</h3><p> Notice in this example that the screenshot file name does not include the file type extension -- to find out why, please read <a href="#jadeimages" title="Images in DocBook Tools">the section called “Images in DocBook Tools”</a>. @@ -845,7 +845,7 @@ make: *** No rule to make target `love'. Stop. Note the use of tags <tt><prompt></tt> and <tt><userinput></tt> for marking system prompt and commands entered by user. - <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914131"/>NOTE</h3><p> + <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2911833"/>NOTE</h3><p> Note that both <tt><programlisting></tt> and <tt><screen></tt> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -858,7 +858,7 @@ make: *** No rule to make target `love'. Stop. <tt><itemizedlist></tt>, <tt><orderedlist></tt>, and <tt><variablelist></tt>. - </p><div class="variablelist"><dl><dt><a name="id2914250"/><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2914269"/> + </p><div class="variablelist"><dl><dt><a name="id2911950"/><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2911969"/> This is the simplest unnumbered list, parallel to <tt><ul></tt> in HTML. Here is an example: <pre class="programlisting"> @@ -889,16 +889,16 @@ make: *** No rule to make target `love'. Stop. </pre> and output: - </p><div class="itemizedlist"><ul><li><p><a name="id2914287"/> + </p><div class="itemizedlist"><ul><li><p><a name="id2912012"/> Show backup files -- This will show any backup file that might be on your system. - </p></li><li><p><a name="id2914360"/> + </p></li><li><p><a name="id2912060"/> Show hidden files -- This will show all "dot files" or files that begin with a dot. This files typically include configuration files and directories. - </p></li><li><p><a name="id2914392"/> + </p></li><li><p><a name="id2912092"/> Mix files and directories -- This option will display files and directories in the order you sort them instead @@ -915,7 +915,7 @@ make: *** No rule to make target `love'. Stop. or -- if none of this applies -- use <a href="#gui" title="GUI elements"><tt><emphasis></tt></a>. - </p></dd><dt><a name="id2914568"/><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2914587"/> + </p></dd><dt><a name="id2912265"/><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2912283"/> This list is completely analogous to <tt><itemizedlist></tt> and has the same syntax, but it produces numbered list. By default, @@ -928,7 +928,7 @@ make: *** No rule to make target `love'. Stop. <tt>loweralpha</tt>, <tt>upperroman</tt>, <tt>lowerroman</tt>. - </p></dd><dt><a name="id2914667"/><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2914687"/> This list is used when each entry is + </p></dd><dt><a name="id2912363"/><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2912382"/> This list is used when each entry is rather long, so it should be formatted as a block of text with some subtitle, like a small subsection. The <tt><variablelist></tt> is more complicated @@ -969,25 +969,25 @@ make: *** No rule to make target `love'. Stop. are smart enough to change the numeration (for <tt><orderedlist></tt>) or marks of each entry (in <tt><itemizedlist></tt>) for sub-lists - </p></div></div><div class="sect2"><a name="inline"/><div class="titlepage"><div><h3 class="title"><a name="inline"/>Inline Elements</h3></div></div><div class="sect3"><a name="gui"/><div class="titlepage"><div><h4 class="title"><a name="gui"/>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2914850"/> + </p></div></div><div class="sect2"><a name="inline"/><div class="titlepage"><div><h3 class="title"><a name="inline"/>Inline Elements</h3></div></div><div class="sect3"><a name="gui"/><div class="titlepage"><div><h4 class="title"><a name="gui"/>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2912542"/> <tt><guibutton></tt> -- used for buttons, including checkbuttons and radio buttons - </p></li><li><p><a name="id2914876"/> + </p></li><li><p><a name="id2912568"/> <tt><guimenu></tt>, <tt><guisubmenu></tt> --used for top-level menus and submenus respectively, for example <tt> <guisubmenu>Utilities</guisubmenu> submenu of the <guimenu>Main Menu</guimenu></tt> - </p></li><li><p><a name="id2914925"/> + </p></li><li><p><a name="id2912619"/> <tt><guimenuitem></tt>--an entry in a menu - </p></li><li><p><a name="id2914951"/> + </p></li><li><p><a name="id2912642"/> <tt><guiicon></tt>--an icon - </p></li><li><p><a name="id2914974"/> + </p></li><li><p><a name="id2912666"/> <tt><guilabel></tt>--for items which have labels, like tabs, or bounding boxes. - </p></li><li><p><a name="id2915000"/> + </p></li><li><p><a name="id2912692"/> <tt><interface></tt>-- for most everything else... a window, a dialog box, the Panel, etc. </p></li></ul></div><p> @@ -1035,35 +1035,35 @@ url="http://www.gnome.org">GNOME Web page</ulink> computer-related things</h4></div></div><p> Here are some tags used to describe operating system-related things: - </p><div class="itemizedlist"><ul><li><p><a name="id2915404"/> <tt><filename></tt> -- used + </p><div class="itemizedlist"><ul><li><p><a name="id2913087"/> <tt><filename></tt> -- used for filenames, e.g.<tt><filename></tt> foo.sgml <tt></filename></tt> produces: <tt>foo.sgml</tt>. - </p></li><li><p><a name="id2915458"/> <tt><filename + </p></li><li><p><a name="id2913141"/> <tt><filename class="directory"></tt> -- used for directories, e.g.<tt><filename class="directory"></tt>/usr/bin <tt></filename></tt> produces: <tt>/usr/bin</tt>. - </p></li><li><p><a name="id2915520"/> + </p></li><li><p><a name="id2913201"/> <tt><application></tt> -- used for application names, e.g. <tt><application></tt>Gnumeric <tt></application></tt> produces: Gnumeric. - </p></li><li><p><a name="id2915575"/> + </p></li><li><p><a name="id2913256"/> <tt><envar></tt> -- used for environment variables, e.g. <tt><envar></tt>PATH<tt></envar></tt>. - </p></li><li><p><a name="id2915616"/> + </p></li><li><p><a name="id2913297"/> <tt><command></tt> -- used for commands entered on command line, e.g. <tt><command></tt>make install <tt></command></tt> produces: <b>make install</b>. - </p></li><li><p><a name="id2915670"/> + </p></li><li><p><a name="id2913353"/> <tt><replaceable></tt> -- used for replaceable text, e.g. <tt><command></tt>db2html<tt><replaceable></tt> @@ -1080,9 +1080,9 @@ url="http://www.gnome.org">GNOME Web page</ulink> other tags for keys, too: <tt><keysym></tt> and <tt><keycode></tt>. However you are unlikely to need these for most documentation. For reference, - <tt><keysym></tt> is for the ‘symbolic - name’ of a key. <tt><keycode></tt> is - for the ‘scan code’ of a key. These are not + <tt><keysym></tt> is for the “symbolic + name” of a key. <tt><keycode></tt> is + for the “scan code” of a key. These are not terms commonly required in GNOME documentation, although <tt><keysym></tt> is useful for marking up control codes. @@ -1131,15 +1131,15 @@ url="http://www.gnome.org">GNOME Web page</ulink> is required. </p><p> here is partial list of most commonly used enitites: - </p><div class="itemizedlist"><ul><li><p><a name="id2916148"/> + </p><div class="itemizedlist"><ul><li><p><a name="id2913824"/> <tt>&amp;</tt> -- ampersend (&) - </p></li><li><p><a name="id2916166"/> + </p></li><li><p><a name="id2913843"/> <tt>&lt;</tt> -- left angle bracket (<) - </p></li><li><p><a name="id2916186"/> + </p></li><li><p><a name="id2913862"/> <tt>&copy;</tt> -- copyright sign (©) - </p></li><li><p><a name="id2916204"/> + </p></li><li><p><a name="id2913880"/> <tt>&mdash;</tt> -- long dash (--) - </p></li><li><p><a name="id2916226"/> + </p></li><li><p><a name="id2913902"/> <tt>&hellip;</tt> -- ellipsis (...) </p></li></ul></div><p> Note that the actual look of the resulting symbols depends @@ -1194,7 +1194,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> each window or panel presented to the user using screenshots (in PNG format only) when appropriate. They should also describe each feature and preference option available. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916687"/>Documentation Availability</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914346"/>Documentation Availability</h3><p> Applications and applets should not rely on documentation which is only available on the internet. All manuals and other documentation should be packaged with the application or @@ -1205,14 +1205,14 @@ url="http://www.gnome.org">GNOME Web page</ulink> the templates in <a href="#template2-1x" title="Template 2: Applet Manual For GNOME 1.x">the section called “Template 2: Applet Manual For GNOME 1.x”</a> for GNOME versions 1.x and the templates in <a href="#template2-2x" title="Template 2: Applet Manual For GNOME 2.x">the section called “Template 2: Applet Manual For GNOME 2.x”</a> for GNOME versions 2.x. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916728"/>Manuals For Large Applications</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914439"/>Manuals For Large Applications</h3><p> Manuals for very large applications, such as GNOME Workshop components should be a <tt><book></tt> (and thus use <tt><chapter></tt> for each primary section) , instead of <tt><article></tt> which most applications use(with each primary section being a <tt><sect1></tt>). - </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916843"/>Applet Manuals in GNOME 2.0</h3><p> + </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914497"/>Applet Manuals in GNOME 2.0</h3><p> Note that applet manuals in GNOME 2.0 are treated in a special way. The manuals for all applets are merged into a single virtual document by Nautilus. For this reason, the header @@ -1228,7 +1228,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> application, as described in <a href="#listingdocsinhelpmenu" title="Listing Documents in the Help Menu">the section called “Listing Documents in the Help Menu”</a>. Applets should make their manuals available by right-clicking on the applet. - </p></div><div class="sect1"><a name="listingdocsinhelpmenu"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"/>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2916967"/>Developer Information</h3><p> + </p></div><div class="sect1"><a name="listingdocsinhelpmenu"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"/>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914617"/>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1260,7 +1260,7 @@ function-reference.html Gnumeric function reference application's name. The application documentation (converted from SGML into HTML with <b>db2html</b>) should be placed in this directory too. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917156"/>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914806"/>Note</h3><p> If the help files are not present in the correct directory, the menu items will NOT appear when the program is run. </p></div><p> @@ -1286,7 +1286,7 @@ GnomeUIInfo helpmenu[] = { Help menu. When the user selects any of these topics from the Help menu, a help browser will be started with the associated HTML documentation. - </p></div><div class="sect1"><a name="applicationhelpbuttons"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"/>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917325"/>Developer Information</h3><p> + </p></div><div class="sect1"><a name="applicationhelpbuttons"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"/>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2914972"/>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1311,7 +1311,7 @@ if (tmp) { gnome_help_goto(0, tmp); g_free(tmp); } - </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917463"/>NOTE</h3><p> + </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2915108"/>NOTE</h3><p> The example above is in the C language, please refer to other documentation or forums for other GNOME language bindings. </p></div></div><div class="sect1"><a name="packagingappletdocs"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="packagingappletdocs"/>Packaging Applet Documentation</h2></div></div><div class="sect2"><a name="appletfiles"/><div class="titlepage"><div><h3 class="title"><a name="appletfiles"/>Applet Documentation Files</h3></div></div><p> @@ -1348,7 +1348,7 @@ if (tmp) { of the <i>GNOME Applets</i> book, you must remember to add <tt><legalnotice></tt> and <tt><copyright></tt> sections. - </p></div><div class="sect2"><a name="appletmenu"/><div class="titlepage"><div><h3 class="title"><a name="appletmenu"/>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2917715"/>Developer Information</h3><p> + </p></div><div class="sect2"><a name="appletmenu"/><div class="titlepage"><div><h3 class="title"><a name="appletmenu"/>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2915355"/>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -1453,7 +1453,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", </p></div><div class="sect2"><a name="balance"/><div class="titlepage"><div><h3 class="title"><a name="balance"/>Achieving a Balanced Style</h3></div></div><p> Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - <div class="itemizedlist"><ul><li><p><a name="id2918265"/> + <div class="itemizedlist"><ul><li><p><a name="id2915900"/> Documents should be complete, yet concise. You should describe every feature, but you'll have decide how much detail is really necessary. It's not, for example, @@ -1463,7 +1463,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - </p></li><li><p><a name="id2918292"/> + </p></li><li><p><a name="id2915927"/> Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -1472,14 +1472,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - </p></li><li><p><a name="id2918332"/> + </p></li><li><p><a name="id2915966"/> Examples, tips, notes, and screenshots are useful to break up long stretches of text, but too many can get in the way, and make your documents too choppy to read. It's good to provide a screenshot of any dialog windows a user might run into, but if a dialog box has several tabs, it's not usually necessary to have one for each. - </p></li><li><p><a name="id2918356"/> + </p></li><li><p><a name="id2915990"/> The GDP strives to have all of its documentation conform to certain standards of style and content, but every document (and every writer) is different. You will need diff --git a/tests/docbook/result/xtchunk/html/index.orig b/tests/docbook/result/xtchunk/html/index.orig index f01b83d2..a14923b2 100644 --- a/tests/docbook/result/xtchunk/html/index.orig +++ b/tests/docbook/result/xtchunk/html/index.orig @@ -84,7 +84,7 @@ irc.gnome.org is another option for contacting GDP members. </p></div></div><div class="sect2"><a name="notation"></a><div class="titlepage"><div><h3 class="title"><a name="notation"></a>Notation and Conventions</h3></div></div><p> This Handbook uses the following notation: - <div class="informaltable" id="id2801086"><a name="id2801086"></a><table border="0"><colgroup><col><col></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> + <div class="informaltable" id="id2807844"><a name="id2807844"></a><table border="0"><colgroup><col><col></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td> Directory </td></tr><tr><td><tt>foo.sgml</tt></td><td> Filename diff --git a/tests/docbook/result/xtchunk/html/indexs02.orig b/tests/docbook/result/xtchunk/html/indexs02.orig index feb9feb7..5d6d6bbb 100644 --- a/tests/docbook/result/xtchunk/html/indexs02.orig +++ b/tests/docbook/result/xtchunk/html/indexs02.orig @@ -42,7 +42,7 @@ help. The <i>DocTable</i> also allows people to make announcements and suggestions and to discuss issues in the comments section. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2801723"></a>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2801390"></a>Note</h3><p> Note that the information in the <i>DocTable</i> may not always be up-to-date or accurate. When you assign yourself to documenting an @@ -54,7 +54,7 @@ this for documentation, not least of which is the single source nature of SGML. To contribute to the GDP you should learn to use DocBook. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2801811"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2801476"></a>NOTE</h3><p> To get started writing for the GDP you do not need to rush out and learn DocBook - if you feel it is too much to handle for now, you can submit plain ASCII text to the <a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top"> @@ -100,14 +100,14 @@ your output document appearance subtly vary between the two DTD's. To install the GDP custom DTD with PNG image support by hand: - </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2802236"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: opencircle"><p><a name="id2801862"></a> Download <a href="http://www.labs.redhat.com/png/png-support.html" target="_top">the GDP DocBook DTD for PNG support</a> and install it where you keep your DTD's. (On Red Hat use <tt>/usr/lib/sgml/</tt>.) Note that the 3.0 DTD is missing support for the <tt><legalnotice></tt> tag, so it is recommended that you use version 3.1 - </p></li><li style="list-style-type: disc"><p><a name="id2802403"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2802192"></a> Add the new DTD to your SGML CATALOG file. The location of your SGML CATALOG file may vary depending upon your distribution. (On Red Hat it is usually in @@ -185,7 +185,7 @@ V1.1//EN"[]> the command <tt>$</tt><b>db2ps mydocument.sgml</b>, after which you can print out or view the resulting .ps file. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2802319"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2922138"></a>NOTE</h3><p> The html files you get will not look quite the same as the documentation distributed with GNOME unless you have the custom stylesheets installed on your machine. DocBook @@ -236,24 +236,24 @@ V1.1//EN"[]> There are many resources available to help you learn DocBook. The following resources on the web are useful for learning DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2924182"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2922428"></a> <a href="http://www.docbook.org" target="_top">http://www.docbook.org</a> - Norman Walsh's <i>DocBook: The Definitive Guide</i>. Online O'Reilly book on using DocBook. Contains an excellent element reference. May be too formal for a beginner. - </p></li><li style="list-style-type: disc"><p><a name="id2924237"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2922474"></a> <a href="http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html" target="_top">A Practical Introduction to DocBook</a> - The Open Source Writers Group's introduction to using DocBook. This is an excellent HOW-TO type article on getting started. - </p></li><li style="list-style-type: disc"><p><a name="id2924278"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2922514"></a> <a href="http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html" target="_top">Getting Going with DocBook: Notes for Hackers</a> - Mark Galassi's introduction to DocBook for hackers. This has to be one of the first introductions to DocBook ever - still as good as it ever was. - </p></li><li style="list-style-type: disc"><p><a name="id2924317"></a> + </p></li><li style="list-style-type: disc"><p><a name="id2922554"></a> <a href="http://www.freebsd.org/tutorials/docproj-primer/" target="_top"> FreeBSD Documentation Project Primer for New Contributors</a> - FreeBSD documentation project @@ -266,7 +266,7 @@ V1.1//EN"[]> </p><p> The following sections of this document are designed to help documentation authors write correct and consistent DocBook: - </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2924384"></a> + </p><div class="itemizedlist"><ul><li style="list-style-type: disc"><p><a name="id2922629"></a> <a href="indexs04.html" title="DocBook Basics ">the section called “DocBook Basics ”</a> - Descriptions of commonly used DocBook tags. </p></li></ul></div><p> diff --git a/tests/docbook/result/xtchunk/html/indexs04.orig b/tests/docbook/result/xtchunk/html/indexs04.orig index 14241b11..53e65165 100644 --- a/tests/docbook/result/xtchunk/html/indexs04.orig +++ b/tests/docbook/result/xtchunk/html/indexs04.orig @@ -72,7 +72,7 @@ ready for this transistion, it is <i>strongly advised</i> that the documentation writers conform to XML syntax rules. Here are most important differences: - </p><div class="variablelist"><dl><dt><a name="id2926888"></a><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2926907"></a> + </p><div class="variablelist"><dl><dt><a name="id2925066"></a><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2925084"></a> It is possible with some implementations of SGML to use minimizations to close elements in a document by using </>, for example: @@ -83,7 +83,7 @@ if you are using Emacs with psgml mode, you can also use menu command Modify->Normalize. - </p></dd><dt><a name="id2927021"></a><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2927040"></a> + </p></dd><dt><a name="id2925197"></a><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2925216"></a> Also, in SGML some tags are allowed not to have closing tags. For example, it is legal for <tt><xref></tt> not to have a closing tag: @@ -93,7 +93,7 @@ <tt><tt><xref linkend="someid"/></tt></tt> (note the slash!). - </p></dd><dt><a name="id2927104"></a><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2927123"></a> + </p></dd><dt><a name="id2925280"></a><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2925298"></a> In XML, unlike SGML, tags are case-senstive <tt><title></tt> and <tt><TITLE></tt> are different tags! @@ -159,7 +159,7 @@ actual file name (without extension). The result will look like this: <div class="figure"><p><a name="shot1"></a><b>Figure 1. Screenshot</b></p><div class="screenshot"><p><img src="figures/example_screenshot"></p></div></div> - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2927632"></a>NOTE</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2925817"></a>NOTE</h3><p> Notice in this example that the screenshot file name does not include the file type extension -- to find out why, please read <a href="indexs02.html#jadeimages" title="Images in DocBook Tools">the section called “Images in DocBook Tools”</a>. @@ -207,7 +207,7 @@ make: *** No rule to make target `love'. Stop. Note the use of tags <tt><prompt></tt> and <tt><userinput></tt> for marking system prompt and commands entered by user. - <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2927876"></a>NOTE</h3><p> + <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2926039"></a>NOTE</h3><p> Note that both <tt><programlisting></tt> and <tt><screen></tt> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -220,7 +220,7 @@ make: *** No rule to make target `love'. Stop. <tt><itemizedlist></tt>, <tt><orderedlist></tt>, and <tt><variablelist></tt>. - </p><div class="variablelist"><dl><dt><a name="id2927995"></a><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2928015"></a> + </p><div class="variablelist"><dl><dt><a name="id2926156"></a><span class="term"> <tt><itemizedlist></tt></span></dt><dd><p><a name="id2926175"></a> This is the simplest unnumbered list, parallel to <tt><ul></tt> in HTML. Here is an example: <pre class="programlisting"> @@ -251,16 +251,16 @@ make: *** No rule to make target `love'. Stop. </pre> and output: - </p><div class="itemizedlist"><ul><li><p><a name="id2928033"></a> + </p><div class="itemizedlist"><ul><li><p><a name="id2926218"></a> Show backup files -- This will show any backup file that might be on your system. - </p></li><li><p><a name="id2928106"></a> + </p></li><li><p><a name="id2926266"></a> Show hidden files -- This will show all "dot files" or files that begin with a dot. This files typically include configuration files and directories. - </p></li><li><p><a name="id2928138"></a> + </p></li><li><p><a name="id2926298"></a> Mix files and directories -- This option will display files and directories in the order you sort them instead @@ -278,7 +278,7 @@ make: *** No rule to make target `love'. Stop. or -- if none of this applies -- use <a href="indexs04.html#gui" title="GUI elements"><tt><emphasis></tt></a>. - </p></dd><dt><a name="id2928315"></a><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2928334"></a> + </p></dd><dt><a name="id2926471"></a><span class="term"> <tt><orderedlist></tt></span></dt><dd><p><a name="id2926489"></a> This list is completely analogous to <tt><itemizedlist></tt> and has the same syntax, but it produces numbered list. By default, @@ -291,7 +291,7 @@ make: *** No rule to make target `love'. Stop. <tt>loweralpha</tt>, <tt>upperroman</tt>, <tt>lowerroman</tt>. - </p></dd><dt><a name="id2928414"></a><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2928434"></a> This list is used when each entry is + </p></dd><dt><a name="id2926569"></a><span class="term"> <tt><variablelist></tt></span></dt><dd><p><a name="id2926588"></a> This list is used when each entry is rather long, so it should be formatted as a block of text with some subtitle, like a small subsection. The <tt><variablelist></tt> is more complicated @@ -332,25 +332,25 @@ make: *** No rule to make target `love'. Stop. are smart enough to change the numeration (for <tt><orderedlist></tt>) or marks of each entry (in <tt><itemizedlist></tt>) for sub-lists - </p></div></div><div class="sect2"><a name="inline"></a><div class="titlepage"><div><h3 class="title"><a name="inline"></a>Inline Elements</h3></div></div><div class="sect3"><a name="gui"></a><div class="titlepage"><div><h4 class="title"><a name="gui"></a>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2928596"></a> + </p></div></div><div class="sect2"><a name="inline"></a><div class="titlepage"><div><h3 class="title"><a name="inline"></a>Inline Elements</h3></div></div><div class="sect3"><a name="gui"></a><div class="titlepage"><div><h4 class="title"><a name="gui"></a>GUI elements</h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2926748"></a> <tt><guibutton></tt> -- used for buttons, including checkbuttons and radio buttons - </p></li><li><p><a name="id2928622"></a> + </p></li><li><p><a name="id2926774"></a> <tt><guimenu></tt>, <tt><guisubmenu></tt> --used for top-level menus and submenus respectively, for example <tt> <guisubmenu>Utilities</guisubmenu> submenu of the <guimenu>Main Menu</guimenu></tt> - </p></li><li><p><a name="id2928671"></a> + </p></li><li><p><a name="id2926825"></a> <tt><guimenuitem></tt>--an entry in a menu - </p></li><li><p><a name="id2928697"></a> + </p></li><li><p><a name="id2926848"></a> <tt><guiicon></tt>--an icon - </p></li><li><p><a name="id2928721"></a> + </p></li><li><p><a name="id2926872"></a> <tt><guilabel></tt>--for items which have labels, like tabs, or bounding boxes. - </p></li><li><p><a name="id2928746"></a> + </p></li><li><p><a name="id2926898"></a> <tt><interface></tt>-- for most everything else... a window, a dialog box, the Panel, etc. </p></li></ul></div><p> @@ -398,35 +398,35 @@ url="http://www.gnome.org">GNOME Web page</ulink> computer-related things</h4></div></div><p> Here are some tags used to describe operating system-related things: - </p><div class="itemizedlist"><ul><li><p><a name="id2929150"></a> <tt><filename></tt> -- used + </p><div class="itemizedlist"><ul><li><p><a name="id2927293"></a> <tt><filename></tt> -- used for filenames, e.g.<tt><filename></tt> foo.sgml <tt></filename></tt> produces: <tt>foo.sgml</tt>. - </p></li><li><p><a name="id2929205"></a> <tt><filename + </p></li><li><p><a name="id2927347"></a> <tt><filename class="directory"></tt> -- used for directories, e.g.<tt><filename class="directory"></tt>/usr/bin <tt></filename></tt> produces: <tt>/usr/bin</tt>. - </p></li><li><p><a name="id2929266"></a> + </p></li><li><p><a name="id2927407"></a> <tt><application></tt> -- used for application names, e.g. <tt><application></tt>Gnumeric <tt></application></tt> produces: Gnumeric. - </p></li><li><p><a name="id2929321"></a> + </p></li><li><p><a name="id2927462"></a> <tt><envar></tt> -- used for environment variables, e.g. <tt><envar></tt>PATH<tt></envar></tt>. - </p></li><li><p><a name="id2929362"></a> + </p></li><li><p><a name="id2927503"></a> <tt><command></tt> -- used for commands entered on command line, e.g. <tt><command></tt>make install <tt></command></tt> produces: <b>make install</b>. - </p></li><li><p><a name="id2929417"></a> + </p></li><li><p><a name="id2927559"></a> <tt><replaceable></tt> -- used for replaceable text, e.g. <tt><command></tt>db2html<tt><replaceable></tt> @@ -443,9 +443,9 @@ url="http://www.gnome.org">GNOME Web page</ulink> other tags for keys, too: <tt><keysym></tt> and <tt><keycode></tt>. However you are unlikely to need these for most documentation. For reference, - <tt><keysym></tt> is for the ‘symbolic - name’ of a key. <tt><keycode></tt> is - for the ‘scan code’ of a key. These are not + <tt><keysym></tt> is for the “symbolic + name” of a key. <tt><keycode></tt> is + for the “scan code” of a key. These are not terms commonly required in GNOME documentation, although <tt><keysym></tt> is useful for marking up control codes. @@ -494,15 +494,15 @@ url="http://www.gnome.org">GNOME Web page</ulink> is required. </p><p> here is partial list of most commonly used enitites: - </p><div class="itemizedlist"><ul><li><p><a name="id2929894"></a> + </p><div class="itemizedlist"><ul><li><p><a name="id2928030"></a> <tt>&amp;</tt> -- ampersend (&) - </p></li><li><p><a name="id2929913"></a> + </p></li><li><p><a name="id2928049"></a> <tt>&lt;</tt> -- left angle bracket (<) - </p></li><li><p><a name="id2929932"></a> + </p></li><li><p><a name="id2928068"></a> <tt>&copy;</tt> -- copyright sign (©) - </p></li><li><p><a name="id2929951"></a> + </p></li><li><p><a name="id2928086"></a> <tt>&mdash;</tt> -- long dash (--) - </p></li><li><p><a name="id2929970"></a> + </p></li><li><p><a name="id2928108"></a> <tt>&hellip;</tt> -- ellipsis (...) </p></li></ul></div><p> Note that the actual look of the resulting symbols depends diff --git a/tests/docbook/result/xtchunk/html/indexs06.orig b/tests/docbook/result/xtchunk/html/indexs06.orig index 464ff74f..25197629 100644 --- a/tests/docbook/result/xtchunk/html/indexs06.orig +++ b/tests/docbook/result/xtchunk/html/indexs06.orig @@ -7,7 +7,7 @@ each window or panel presented to the user using screenshots (in PNG format only) when appropriate. They should also describe each feature and preference option available. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2930434"></a>Documentation Availability</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2928552"></a>Documentation Availability</h3><p> Applications and applets should not rely on documentation which is only available on the internet. All manuals and other documentation should be packaged with the application or @@ -18,14 +18,14 @@ the templates in <a href="apas02.html" title="Template 2: Applet Manual For GNOME 1.x">the section called “Template 2: Applet Manual For GNOME 1.x”</a> for GNOME versions 1.x and the templates in <a href="apas03.html" title="Template 2: Applet Manual For GNOME 2.x">the section called “Template 2: Applet Manual For GNOME 2.x”</a> for GNOME versions 2.x. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2930474"></a>Manuals For Large Applications</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2928645"></a>Manuals For Large Applications</h3><p> Manuals for very large applications, such as GNOME Workshop components should be a <tt><book></tt> (and thus use <tt><chapter></tt> for each primary section) , instead of <tt><article></tt> which most applications use(with each primary section being a <tt><sect1></tt>). - </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2930589"></a>Applet Manuals in GNOME 2.0</h3><p> + </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2928703"></a>Applet Manuals in GNOME 2.0</h3><p> Note that applet manuals in GNOME 2.0 are treated in a special way. The manuals for all applets are merged into a single virtual document by Nautilus. For this reason, the header diff --git a/tests/docbook/result/xtchunk/html/indexs07.orig b/tests/docbook/result/xtchunk/html/indexs07.orig index 50ee6bcb..4f8f541e 100644 --- a/tests/docbook/result/xtchunk/html/indexs07.orig +++ b/tests/docbook/result/xtchunk/html/indexs07.orig @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"><title>Listing Documents in the Help Menu</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"><link rel="home" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="up" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="previous" href="indexs06.html" title="Writing Application and Applet Manuals"><link rel="next" href="indexs08.html" title="Application Help Buttons"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Listing Documents in the Help Menu</th></tr><tr><td width="20%" align="left"><a href="indexs06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a href="indexs08.html">Next</a></td></tr></table><hr></div><div class="sect1"><a name="listingdocsinhelpmenu"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"></a>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2930714"></a>Developer Information</h3><p> +<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"><title>Listing Documents in the Help Menu</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"><link rel="home" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="up" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="previous" href="indexs06.html" title="Writing Application and Applet Manuals"><link rel="next" href="indexs08.html" title="Application Help Buttons"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Listing Documents in the Help Menu</th></tr><tr><td width="20%" align="left"><a href="indexs06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a href="indexs08.html">Next</a></td></tr></table><hr></div><div class="sect1"><a name="listingdocsinhelpmenu"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="listingdocsinhelpmenu"></a>Listing Documents in the Help Menu</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2928823"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -31,7 +31,7 @@ function-reference.html Gnumeric function reference application's name. The application documentation (converted from SGML into HTML with <b>db2html</b>) should be placed in this directory too. - </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2930903"></a>Note</h3><p> + </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2929012"></a>Note</h3><p> If the help files are not present in the correct directory, the menu items will NOT appear when the program is run. </p></div><p> diff --git a/tests/docbook/result/xtchunk/html/indexs08.orig b/tests/docbook/result/xtchunk/html/indexs08.orig index 5ff26f28..501436e9 100644 --- a/tests/docbook/result/xtchunk/html/indexs08.orig +++ b/tests/docbook/result/xtchunk/html/indexs08.orig @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"><title>Application Help Buttons</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"><link rel="home" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="up" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="previous" href="indexs07.html" title="Listing Documents in the Help Menu"><link rel="next" href="indexs09.html" title="Packaging Applet Documentation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Application Help Buttons</th></tr><tr><td width="20%" align="left"><a href="indexs07.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a href="indexs09.html">Next</a></td></tr></table><hr></div><div class="sect1"><a name="applicationhelpbuttons"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"></a>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2931072"></a>Developer Information</h3><p> +<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"><title>Application Help Buttons</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"><link rel="home" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="up" href="index.html" title="The GNOME Handbook of Writing Software Documentation"><link rel="previous" href="indexs07.html" title="Listing Documents in the Help Menu"><link rel="next" href="indexs09.html" title="Packaging Applet Documentation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Application Help Buttons</th></tr><tr><td width="20%" align="left"><a href="indexs07.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a href="indexs09.html">Next</a></td></tr></table><hr></div><div class="sect1"><a name="applicationhelpbuttons"></a><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="applicationhelpbuttons"></a>Application Help Buttons</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2929178"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> @@ -24,7 +24,7 @@ if (tmp) { gnome_help_goto(0, tmp); g_free(tmp); } - </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2931210"></a>NOTE</h3><p> + </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2929314"></a>NOTE</h3><p> The example above is in the C language, please refer to other documentation or forums for other GNOME language bindings. </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="indexs07.html">Prev</a> </td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right"> <a href="indexs09.html">Next</a></td></tr><tr><td width="40%" align="left">Listing Documents in the Help Menu </td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right"> Packaging Applet Documentation</td></tr></table></div></body></html> diff --git a/tests/docbook/result/xtchunk/html/indexs09.orig b/tests/docbook/result/xtchunk/html/indexs09.orig index 065e2399..a5ff1fe7 100644 --- a/tests/docbook/result/xtchunk/html/indexs09.orig +++ b/tests/docbook/result/xtchunk/html/indexs09.orig @@ -33,7 +33,7 @@ of the <i>GNOME Applets</i> book, you must remember to add <tt><legalnotice></tt> and <tt><copyright></tt> sections. - </p></div><div class="sect2"><a name="appletmenu"></a><div class="titlepage"><div><h3 class="title"><a name="appletmenu"></a>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2931461"></a>Developer Information</h3><p> + </p></div><div class="sect2"><a name="appletmenu"></a><div class="titlepage"><div><h3 class="title"><a name="appletmenu"></a>Adding Documentation to an Applet Menu</h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2929561"></a>Developer Information</h3><p> This section is for developers. Documentation authors generally do not need to know this material. </p></div><p> diff --git a/tests/docbook/result/xtchunk/html/indexs12.orig b/tests/docbook/result/xtchunk/html/indexs12.orig index ccbe8a66..934cdb66 100644 --- a/tests/docbook/result/xtchunk/html/indexs12.orig +++ b/tests/docbook/result/xtchunk/html/indexs12.orig @@ -34,7 +34,7 @@ </p></div><div class="sect2"><a name="balance"></a><div class="titlepage"><div><h3 class="title"><a name="balance"></a>Achieving a Balanced Style</h3></div></div><p> Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - <div class="itemizedlist"><ul><li><p><a name="id2932012"></a> + <div class="itemizedlist"><ul><li><p><a name="id2930106"></a> Documents should be complete, yet concise. You should describe every feature, but you'll have decide how much detail is really necessary. It's not, for example, @@ -44,7 +44,7 @@ you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - </p></li><li><p><a name="id2932039"></a> + </p></li><li><p><a name="id2930133"></a> Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -53,14 +53,14 @@ maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - </p></li><li><p><a name="id2932078"></a> + </p></li><li><p><a name="id2930172"></a> Examples, tips, notes, and screenshots are useful to break up long stretches of text, but too many can get in the way, and make your documents too choppy to read. It's good to provide a screenshot of any dialog windows a user might run into, but if a dialog box has several tabs, it's not usually necessary to have one for each. - </p></li><li><p><a name="id2932102"></a> + </p></li><li><p><a name="id2930196"></a> The GDP strives to have all of its documentation conform to certain standards of style and content, but every document (and every writer) is different. You will need diff --git a/tests/general/bug-12-.out b/tests/general/bug-12-.out index b63ec6c8..f1270f30 100644 --- a/tests/general/bug-12-.out +++ b/tests/general/bug-12-.out @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<namespace>http://test.com</namespace> +<namespace>http://www.w3.org/XML/1998/namespace</namespace> diff --git a/tests/general/bug-63.out b/tests/general/bug-63.out index 95f095f5..12572668 100644 --- a/tests/general/bug-63.out +++ b/tests/general/bug-63.out @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<namespace><name>xsl</name><uri>http://www.w3.org/1999/XSL/Transform</uri><parent><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<namespace><name>xml</name><uri>http://www.w3.org/XML/1998/namespace</uri><parent><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:template match="*"> <xsl:for-each select="namespace::*"> <namespace> @@ -9,7 +9,7 @@ </namespace> </xsl:for-each> </xsl:template> -</xsl:stylesheet></parent></namespace><namespace><name>xml</name><uri>http://www.w3.org/XML/1998/namespace</uri><parent><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +</xsl:stylesheet></parent></namespace><namespace><name>xsl</name><uri>http://www.w3.org/1999/XSL/Transform</uri><parent><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:template match="*"> <xsl:for-each select="namespace::*"> <namespace> |