summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2001-06-23 17:06:54 +0000
committerDaniel Veillard <veillard@src.gnome.org>2001-06-23 17:06:54 +0000
commit1872dd788442c01fc61890ad67bcbdb0b7d140a0 (patch)
tree81a0440ae21997e8b361c63cf18c59b9b3889819 /tests
parent06dd93086f613f40dc0c28ff599b46e39b84e6ca (diff)
downloadlibxslt-1872dd788442c01fc61890ad67bcbdb0b7d140a0.tar.gz
libxslt-1872dd788442c01fc61890ad67bcbdb0b7d140a0.tar.bz2
libxslt-1872dd788442c01fc61890ad67bcbdb0b7d140a0.zip
updated to docbook-xsl-1.4, regenerated results Daniel
* test/docbook: updated to docbook-xsl-1.4, regenerated results Daniel
Diffstat (limited to 'tests')
-rw-r--r--tests/docbook/BUGS6
-rw-r--r--tests/docbook/ChangeLog34
-rw-r--r--tests/docbook/Makefile.am2
-rw-r--r--tests/docbook/README49
-rw-r--r--tests/docbook/TODO4
-rw-r--r--tests/docbook/VERSION2
-rw-r--r--tests/docbook/WhatsNew91
-rw-r--r--tests/docbook/common/ChangeLog99
-rw-r--r--tests/docbook/common/ca.xml421
-rw-r--r--tests/docbook/common/common.xsl1207
-rw-r--r--tests/docbook/common/cs.xml423
-rw-r--r--tests/docbook/common/da.xml419
-rw-r--r--tests/docbook/common/de.xml418
-rw-r--r--tests/docbook/common/el.xml423
-rw-r--r--tests/docbook/common/en.xml420
-rw-r--r--tests/docbook/common/es.xml419
-rw-r--r--tests/docbook/common/et.xml423
-rw-r--r--tests/docbook/common/fi.xml417
-rw-r--r--tests/docbook/common/fr.xml422
-rw-r--r--tests/docbook/common/gentext.xsl385
-rw-r--r--tests/docbook/common/hu.xml413
-rw-r--r--tests/docbook/common/id.xml423
-rw-r--r--tests/docbook/common/it.xml434
-rw-r--r--tests/docbook/common/ja.xml424
-rw-r--r--tests/docbook/common/ko.xml411
-rw-r--r--tests/docbook/common/l10n.dtd14
-rw-r--r--tests/docbook/common/l10n.xml2
-rw-r--r--tests/docbook/common/l10n.xsl51
-rw-r--r--tests/docbook/common/labels.xsl516
-rw-r--r--tests/docbook/common/nl.xml421
-rw-r--r--tests/docbook/common/no.xml416
-rw-r--r--tests/docbook/common/pl.xml401
-rw-r--r--tests/docbook/common/pt.xml419
-rw-r--r--tests/docbook/common/pt_br.xml419
-rw-r--r--tests/docbook/common/ro.xml429
-rw-r--r--tests/docbook/common/ru.xml457
-rw-r--r--tests/docbook/common/sk.xml423
-rw-r--r--tests/docbook/common/sl.xml423
-rw-r--r--tests/docbook/common/sr.xml337
-rw-r--r--tests/docbook/common/subtitles.xsl130
-rw-r--r--tests/docbook/common/sv.xml420
-rw-r--r--tests/docbook/common/titles.xsl335
-rw-r--r--tests/docbook/common/zh_cn.xml414
-rw-r--r--tests/docbook/common/zh_tw.xml393
-rw-r--r--tests/docbook/doc/ChangeLog11
-rw-r--r--tests/docbook/doc/book.xsl49
-rw-r--r--tests/docbook/doc/ch01s02.html67
-rw-r--r--tests/docbook/doc/ch01s03.html422
-rw-r--r--tests/docbook/doc/ch01s04.html250
-rw-r--r--tests/docbook/doc/ch02s02.html7
-rw-r--r--tests/docbook/doc/ch03.html3
-rw-r--r--tests/docbook/doc/ch04.html58
-rw-r--r--tests/docbook/doc/common/ChangeLog4
-rw-r--r--tests/docbook/doc/common/common.html379
-rw-r--r--tests/docbook/doc/copyright.html19
-rw-r--r--tests/docbook/doc/extensions.html41
-rw-r--r--tests/docbook/doc/fo/ChangeLog4
-rw-r--r--tests/docbook/doc/fo/param.html1616
-rw-r--r--tests/docbook/doc/fo/table.html181
-rw-r--r--tests/docbook/doc/html/ChangeLog4
-rw-r--r--tests/docbook/doc/html/ebnf.html103
-rw-r--r--tests/docbook/doc/html/param.html1815
-rw-r--r--tests/docbook/doc/index.html3
-rw-r--r--tests/docbook/doc/jrefhtml.xsl33
-rw-r--r--tests/docbook/doc/lib/ChangeLog4
-rw-r--r--tests/docbook/doc/lib/lib.html161
-rw-r--r--tests/docbook/doc/pr01.html4
-rw-r--r--tests/docbook/doc/publishing.html52
-rw-r--r--tests/docbook/doc/reference.css4
-rw-r--r--tests/docbook/doc/reference.html9
-rw-r--r--tests/docbook/doc/reference.xsl50
-rw-r--r--tests/docbook/doc/warranty.html10
-rw-r--r--tests/docbook/fo/ChangeLog178
-rw-r--r--tests/docbook/fo/admon.xsl40
-rw-r--r--tests/docbook/fo/autoidx.xsl332
-rw-r--r--tests/docbook/fo/autotoc.xsl128
-rw-r--r--tests/docbook/fo/biblio.xsl52
-rw-r--r--tests/docbook/fo/block.xsl75
-rw-r--r--tests/docbook/fo/callout.xsl147
-rw-r--r--tests/docbook/fo/component.xsl19
-rw-r--r--tests/docbook/fo/division.xsl17
-rw-r--r--tests/docbook/fo/docbook.xsl31
-rw-r--r--tests/docbook/fo/footnote.xsl5
-rw-r--r--tests/docbook/fo/fop.xsl126
-rw-r--r--tests/docbook/fo/formal.xsl40
-rw-r--r--tests/docbook/fo/glossary.xsl87
-rw-r--r--tests/docbook/fo/graphics.xsl182
-rw-r--r--tests/docbook/fo/index.xsl319
-rw-r--r--tests/docbook/fo/inline.xsl45
-rw-r--r--tests/docbook/fo/lists.xsl84
-rw-r--r--tests/docbook/fo/pagesetup.xsl4
-rw-r--r--tests/docbook/fo/param.xsl269
-rw-r--r--tests/docbook/fo/qandaset.xsl124
-rw-r--r--tests/docbook/fo/refentry.xsl18
-rw-r--r--tests/docbook/fo/sections.xsl94
-rw-r--r--tests/docbook/fo/synop.xsl4
-rw-r--r--tests/docbook/fo/table.xsl349
-rw-r--r--tests/docbook/fo/titlepage.templates.xml140
-rw-r--r--tests/docbook/fo/titlepage.templates.xsl679
-rw-r--r--tests/docbook/fo/titlepage.xsl96
-rw-r--r--tests/docbook/fo/toc.xsl190
-rw-r--r--tests/docbook/fo/verbatim.xsl249
-rw-r--r--tests/docbook/fo/xref.xsl402
-rw-r--r--tests/docbook/html/ChangeLog264
-rw-r--r--tests/docbook/html/admon.xsl68
-rw-r--r--tests/docbook/html/autoidx.xsl296
-rw-r--r--tests/docbook/html/autotoc.xsl199
-rw-r--r--tests/docbook/html/biblio.xsl28
-rw-r--r--tests/docbook/html/block.xsl50
-rw-r--r--tests/docbook/html/callout.xsl95
-rw-r--r--tests/docbook/html/changebars.xsl10
-rw-r--r--tests/docbook/html/chunk-common.xsl613
-rw-r--r--tests/docbook/html/chunk.xsl59
-rw-r--r--tests/docbook/html/chunker.xsl163
-rw-r--r--tests/docbook/html/component.xsl101
-rw-r--r--tests/docbook/html/division.xsl6
-rw-r--r--tests/docbook/html/docbook.xsl80
-rw-r--r--tests/docbook/html/ebnf.xsl2
-rw-r--r--tests/docbook/html/footnote.xsl4
-rw-r--r--tests/docbook/html/formal.xsl5
-rw-r--r--tests/docbook/html/glossary.xsl97
-rw-r--r--tests/docbook/html/graphics.xsl144
-rw-r--r--tests/docbook/html/index.xsl313
-rw-r--r--tests/docbook/html/inline.xsl90
-rw-r--r--tests/docbook/html/lists.xsl55
-rw-r--r--tests/docbook/html/param.xsl241
-rw-r--r--tests/docbook/html/qandaset.xsl61
-rw-r--r--tests/docbook/html/refentry.xsl6
-rw-r--r--tests/docbook/html/sections.xsl156
-rw-r--r--tests/docbook/html/synop.xsl2
-rw-r--r--tests/docbook/html/table.xsl133
-rw-r--r--tests/docbook/html/titlepage.templates.xml149
-rw-r--r--tests/docbook/html/titlepage.templates.xsl807
-rw-r--r--tests/docbook/html/titlepage.xsl77
-rw-r--r--tests/docbook/html/toc.xsl146
-rw-r--r--tests/docbook/html/verbatim.xsl213
-rw-r--r--tests/docbook/html/xref.xsl463
-rw-r--r--tests/docbook/html/xtchunk.xsl30
-rw-r--r--tests/docbook/html/xtchunker.xsl70
-rw-r--r--tests/docbook/htmlhelp/ChangeLog13
-rw-r--r--tests/docbook/htmlhelp/doc/ChangeLog8
-rw-r--r--tests/docbook/htmlhelp/doc/htmlhelp.xml145
-rw-r--r--tests/docbook/htmlhelp/htmlhelp-common.xsl359
-rw-r--r--tests/docbook/htmlhelp/htmlhelp.xsl23
-rw-r--r--tests/docbook/htmlhelp/langcodes.xml103
-rw-r--r--tests/docbook/htmlhelp/xthtmlhelp.xsl23
-rw-r--r--tests/docbook/images/ChangeLog5
-rw-r--r--tests/docbook/images/callouts/1.pngbin0 -> 329 bytes
-rw-r--r--tests/docbook/images/callouts/10.pngbin0 -> 361 bytes
-rw-r--r--tests/docbook/images/callouts/2.pngbin0 -> 353 bytes
-rw-r--r--tests/docbook/images/callouts/3.pngbin0 -> 350 bytes
-rw-r--r--tests/docbook/images/callouts/4.pngbin0 -> 345 bytes
-rw-r--r--tests/docbook/images/callouts/5.pngbin0 -> 348 bytes
-rw-r--r--tests/docbook/images/callouts/6.pngbin0 -> 355 bytes
-rw-r--r--tests/docbook/images/callouts/7.pngbin0 -> 344 bytes
-rw-r--r--tests/docbook/images/callouts/8.pngbin0 -> 357 bytes
-rw-r--r--tests/docbook/images/callouts/9.pngbin0 -> 357 bytes
-rw-r--r--tests/docbook/images/callouts/ChangeLog5
-rw-r--r--tests/docbook/images/caution.gifbin0 -> 743 bytes
-rw-r--r--tests/docbook/images/caution.pngbin0 -> 1250 bytes
-rw-r--r--tests/docbook/images/caution.tifbin0 -> 1978 bytes
-rw-r--r--tests/docbook/images/home.pngbin0 -> 1156 bytes
-rw-r--r--tests/docbook/images/important.gifbin0 -> 1003 bytes
-rw-r--r--tests/docbook/images/important.pngbin0 -> 722 bytes
-rw-r--r--tests/docbook/images/important.tifbin0 -> 2020 bytes
-rw-r--r--tests/docbook/images/next.pngbin0 -> 1150 bytes
-rw-r--r--tests/docbook/images/note.gifbin0 -> 580 bytes
-rw-r--r--tests/docbook/images/note.pngbin0 -> 490 bytes
-rw-r--r--tests/docbook/images/note.tifbin0 -> 460 bytes
-rw-r--r--tests/docbook/images/prev.pngbin0 -> 1132 bytes
-rw-r--r--tests/docbook/images/tip.gifbin0 -> 598 bytes
-rw-r--r--tests/docbook/images/tip.pngbin0 -> 449 bytes
-rw-r--r--tests/docbook/images/tip.tifbin0 -> 420 bytes
-rw-r--r--tests/docbook/images/toc-blank.pngbin0 -> 318 bytes
-rw-r--r--tests/docbook/images/toc-minus.pngbin0 -> 259 bytes
-rw-r--r--tests/docbook/images/toc-plus.pngbin0 -> 264 bytes
-rw-r--r--tests/docbook/images/up.pngbin0 -> 1111 bytes
-rw-r--r--tests/docbook/images/warning.gifbin0 -> 743 bytes
-rw-r--r--tests/docbook/images/warning.pngbin0 -> 1241 bytes
-rw-r--r--tests/docbook/images/warning.tifbin0 -> 1990 bytes
-rw-r--r--tests/docbook/lib/ChangeLog20
-rw-r--r--tests/docbook/lib/lib.xsl6
-rw-r--r--tests/docbook/result/fo/article.fo96
-rw-r--r--tests/docbook/result/fo/article2.fo36
-rw-r--r--tests/docbook/result/fo/article3.fo92
-rw-r--r--tests/docbook/result/fo/bib.fo29
-rw-r--r--tests/docbook/result/fo/book.fo240
-rw-r--r--tests/docbook/result/fo/book2.fo1513
-rw-r--r--tests/docbook/result/fo/book3.fo86
-rw-r--r--tests/docbook/result/fo/callout.fo84
-rw-r--r--tests/docbook/result/fo/chunk.fo94
-rw-r--r--tests/docbook/result/fo/classsynop.fo24
-rw-r--r--tests/docbook/result/fo/condition.fo1536
-rw-r--r--tests/docbook/result/fo/docbook40.fo70
-rw-r--r--tests/docbook/result/fo/external.fo22
-rw-r--r--tests/docbook/result/fo/figtest.fo41
-rw-r--r--tests/docbook/result/fo/foottest.fo20
-rw-r--r--tests/docbook/result/fo/fotest.fo54
-rw-r--r--tests/docbook/result/fo/func.fo14
-rw-r--r--tests/docbook/result/fo/gdp-handbook.fo1030
-rw-r--r--tests/docbook/result/fo/graphics.fo50
-rw-r--r--tests/docbook/result/fo/gtest.fo12
-rw-r--r--tests/docbook/result/fo/idxbook.fo206
-rw-r--r--tests/docbook/result/fo/kwrite.fo656
-rw-r--r--tests/docbook/result/fo/multilingual.fo1121
-rw-r--r--tests/docbook/result/fo/qa.fo1332
-rw-r--r--tests/docbook/result/fo/qa2.fo101
-rw-r--r--tests/docbook/result/fo/sectest.fo62
-rw-r--r--tests/docbook/result/fo/set.fo189
-rw-r--r--tests/docbook/result/fo/table.fo104
-rw-r--r--tests/docbook/result/fo/test.fo16
-rw-r--r--tests/docbook/result/fo/verbtest.fo19
-rw-r--r--tests/docbook/result/html/article.html81
-rw-r--r--tests/docbook/result/html/article2.html26
-rw-r--r--tests/docbook/result/html/article3.html92
-rw-r--r--tests/docbook/result/html/bib.html21
-rw-r--r--tests/docbook/result/html/book.html163
-rw-r--r--tests/docbook/result/html/book2.html1126
-rw-r--r--tests/docbook/result/html/book3.html48
-rw-r--r--tests/docbook/result/html/callout.html38
-rw-r--r--tests/docbook/result/html/chunk.html60
-rw-r--r--tests/docbook/result/html/classsynop.html6
-rw-r--r--tests/docbook/result/html/condition.html1138
-rw-r--r--tests/docbook/result/html/docbook40.html42
-rw-r--r--tests/docbook/result/html/external.html16
-rw-r--r--tests/docbook/result/html/figtest.html22
-rw-r--r--tests/docbook/result/html/foottest.html37
-rw-r--r--tests/docbook/result/html/fotest.html26
-rw-r--r--tests/docbook/result/html/func.html4
-rw-r--r--tests/docbook/result/html/gdp-handbook.html573
-rw-r--r--tests/docbook/result/html/graphics.html29
-rw-r--r--tests/docbook/result/html/gtest.html6
-rw-r--r--tests/docbook/result/html/idxbook.html174
-rw-r--r--tests/docbook/result/html/kwrite.html634
-rw-r--r--tests/docbook/result/html/multilingual.html1089
-rw-r--r--tests/docbook/result/html/qa.html532
-rw-r--r--tests/docbook/result/html/qa2.html45
-rw-r--r--tests/docbook/result/html/sectest.html42
-rw-r--r--tests/docbook/result/html/set.html163
-rw-r--r--tests/docbook/result/html/table.html36
-rw-r--r--tests/docbook/result/html/test.html10
-rw-r--r--tests/docbook/result/html/verbtest.html8
-rw-r--r--tests/docbook/result/xhtml/article.xhtml20
-rw-r--r--tests/docbook/result/xhtml/article2.xhtml4
-rw-r--r--tests/docbook/result/xhtml/article3.xhtml4
-rw-r--r--tests/docbook/result/xhtml/bib.xhtml6
-rw-r--r--tests/docbook/result/xhtml/book.xhtml54
-rw-r--r--tests/docbook/result/xhtml/book2.xhtml228
-rw-r--r--tests/docbook/result/xhtml/book3.xhtml14
-rw-r--r--tests/docbook/result/xhtml/callout.xhtml22
-rw-r--r--tests/docbook/result/xhtml/chunk.xhtml4
-rw-r--r--tests/docbook/result/xhtml/classsynop.xhtml2
-rw-r--r--tests/docbook/result/xhtml/condition.xhtml230
-rw-r--r--tests/docbook/result/xhtml/docbook40.xhtml12
-rw-r--r--tests/docbook/result/xhtml/external.xhtml2
-rw-r--r--tests/docbook/result/xhtml/figtest.xhtml16
-rw-r--r--tests/docbook/result/xhtml/foottest.xhtml6
-rw-r--r--tests/docbook/result/xhtml/fotest.xhtml2
-rw-r--r--tests/docbook/result/xhtml/func.xhtml2
-rw-r--r--tests/docbook/result/xhtml/gdp-handbook.xhtml341
-rw-r--r--tests/docbook/result/xhtml/graphics.xhtml2
-rw-r--r--tests/docbook/result/xhtml/gtest.xhtml2
-rw-r--r--tests/docbook/result/xhtml/idxbook.xhtml50
-rw-r--r--tests/docbook/result/xhtml/kwrite.xhtml264
-rw-r--r--tests/docbook/result/xhtml/multilingual.xhtml884
-rw-r--r--tests/docbook/result/xhtml/qa.xhtml2
-rw-r--r--tests/docbook/result/xhtml/qa2.xhtml4
-rw-r--r--tests/docbook/result/xhtml/sectest.xhtml10
-rw-r--r--tests/docbook/result/xhtml/set.xhtml2
-rw-r--r--tests/docbook/result/xhtml/table.xhtml2
-rw-r--r--tests/docbook/result/xhtml/test.xhtml4
-rw-r--r--tests/docbook/result/xhtml/verbtest.xhtml2
-rw-r--r--tests/docbook/template/ChangeLog15
-rw-r--r--tests/docbook/template/README15
-rw-r--r--tests/docbook/template/biblioentry.xsl72
-rw-r--r--tests/docbook/template/testtemplate.xml38
-rw-r--r--tests/docbook/template/titlepage.xsl1129
-rw-r--r--tests/docbook/xhtml/ChangeLog8
-rw-r--r--tests/docbook/xhtml/chunk.xsl20
-rw-r--r--tests/docbook/xhtml/docbook.xsl8
-rw-r--r--tests/docbook/xhtml/xtchunk.xsl137
281 files changed, 34508 insertions, 14870 deletions
diff --git a/tests/docbook/BUGS b/tests/docbook/BUGS
new file mode 100644
index 00000000..5723ffd3
--- /dev/null
+++ b/tests/docbook/BUGS
@@ -0,0 +1,6 @@
+The fo stylesheet is probably not in perfect sync with the html stylesheet
+
+Using Equations w/o titles results in incorrectly numbered
+ equations with titles. Use InformalEquation instead.
+
+The 'char' alignment in tables is not supported
diff --git a/tests/docbook/ChangeLog b/tests/docbook/ChangeLog
new file mode 100644
index 00000000..d9dc09b0
--- /dev/null
+++ b/tests/docbook/ChangeLog
@@ -0,0 +1,34 @@
+2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * VERSION: Version 1.40 released.
+
+2001-05-24 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * VERSION: Version 1.39 released.
+
+2001-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * VERSION: Version 1.38 released.
+
+2001-04-20 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * VERSION: Version 1.37 released.
+
+2001-04-15 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * Makefile, README: Make distribution hacks
+
+2001-04-04 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * VERSION: Version 1.36 released.
+
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile: Misc. cleanup in preparation for making a distrib
+
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * BUGS, Makefile, README.CVS, TODO, VERSION: New file.
+
+ * Makefile: Make common files
+
diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am
index be4778f2..5f3ab398 100644
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -118,4 +118,4 @@ xhtmltests: $(top_builddir)/libxslt/xsltproc
rm -f $$out ; done )
dist-hook:
- @(cd $(srcdir) ; tar -cf - --exclude CVS common html dtd lib xhtml fo result test) | (cd $(distdir); tar xf -)
+ @(cd $(srcdir) ; tar -cf - --exclude CVS common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)
diff --git a/tests/docbook/README b/tests/docbook/README
index a24699aa..bc46878a 100644
--- a/tests/docbook/README
+++ b/tests/docbook/README
@@ -1,6 +1,6 @@
README for the DocBook Stylesheets
-These are XSL stylesheets for the DocBk XML DTD. (They would
+These are XSL stylesheets for the DocBook XML DTD. (They would
also work for the DocBook DTD, modulo certain namecase problems
and the fact that there aren't (yet) any XSL implementations
that work with SGML source documents.)
@@ -9,25 +9,30 @@ As of version 1.0, most of the elements in DocBook are handled
in some way or another, usually reasonably, but there's still
lots of work to be done.
+For more information, see http://docbook.sourceforge.net/
+
Manifest
--------
-README this file
-TODO planned features not yet implemented (may be incomplete :-)
-BUGS known problems (may also be incomplete :-)
-VERSION the current version number (note that this is an XSL stylesheet,
- included by both fo/docbook.xsl and html/docbook.xsl)
-WhatsNew changes since the last public release (for a complete list
- of changes, see the ChangeLog file(s))
-bin/ scripts and other tools that work with the stylesheets
-common/ contains code common to both stylesheets
-contrib/ stylesheets contributed by others
-dtds/ dtds used by the stylesheets or stylesheet outputs
-fo/ a stylesheet that produces XSL FO result trees
-html/ a stylesheet that produces HTML/XHTML result trees
-lib/ contains schema-independent functions
-template/ contains templates for building stylesheet customization layers
-test/ test documents
+README this file
+TODO planned features not yet implemented (may be incomplete :-)
+BUGS known problems (may also be incomplete :-)
+VERSION the current version number (note that this is an XSL stylesheet,
+ included by both fo/docbook.xsl and html/docbook.xsl)
+WhatsNew changes since the last public release (for a complete list
+ of changes, see the ChangeLog file(s))
+common/ contains code common to both stylesheets
+doc/ documentation
+docsrc/ documentation sources
+extensions/ Java extensions
+fo/ stylesheets that produce XSL FO
+html/ stylesheets that produce HTML
+htmlhelp/ stylesheets that produce HTML Help
+images/ images
+javahelp/ stylesheets that produce Java Help
+lib/ contains schema-independent functions
+template/ contains templates for building stylesheet customization layers
+xhtml/ stylesheets that produce XHTML
Changes
-------
@@ -55,12 +60,7 @@ using your favorite XSLT processor:
Copyright
---------
-Copyright (C) 1999, 2000 Norman Walsh
-
-Ironically, assertion of copyright is done to make it _easier_
-to distribute these stylesheets. (At least one organization,
-Software in the Public Interest, requires an explicit copyright
-statement in order to redistribute the software.)
+Copyright (C) 1999, 2000, 2001 Norman Walsh
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -102,6 +102,3 @@ Contacting the Author
---------------------
These stylesheets are maintained by Norman Walsh, <ndw@nwalsh.com>.
-
-The best way to reach norm is by email. You will find additional
-contact information at http://nwalsh.com/~ndw/
diff --git a/tests/docbook/TODO b/tests/docbook/TODO
new file mode 100644
index 00000000..526aca8b
--- /dev/null
+++ b/tests/docbook/TODO
@@ -0,0 +1,4 @@
+Documentation
+Continued lists
+Bibliography support needs improvement
+
diff --git a/tests/docbook/VERSION b/tests/docbook/VERSION
index a674aac1..2e8656ca 100644
--- a/tests/docbook/VERSION
+++ b/tests/docbook/VERSION
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'>
-<xsl:variable name="VERSION">1.29</xsl:variable>
+<xsl:variable name="VERSION">1.40</xsl:variable>
</xsl:stylesheet>
diff --git a/tests/docbook/WhatsNew b/tests/docbook/WhatsNew
new file mode 100644
index 00000000..a06abeff
--- /dev/null
+++ b/tests/docbook/WhatsNew
@@ -0,0 +1,91 @@
+Changes since version 1.39 (2001-05-24)
+
+Changes to docbook/*
+
+ | 2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * VERSION: Version 1.40 released.
+ |
+
+Changes to docbook/common/*
+
+ | 2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * subtitles.xsl: Support subtitle on article
+ |
+
+Changes to docbook/fo/*
+
+ | 2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * sections.xsl: Bug fix: section autolabelling wasn't working
+ | in division bodies
+ |
+ | * titlepage.templates.xml: Changed text-alignment on centered
+ | titles to be 'center' rather than 'justify'
+ |
+ | * xref.xsl: Added anchor template
+ |
+ | 2001-06-13 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * graphics.xsl, param.xsl: Support Arbortext extensions--at
+ | the moment, just to turn off the url() stuff in external
+ | graphic references
+ |
+ | * titlepage.xsl: Bug fix: make a single author in an
+ | authorgroup work correctly
+ |
+ | 2001-06-08 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * callout.xsl, inline.xsl, synop.xsl: Fixed some
+ | unparameterized references to specific font families
+ |
+ | 2001-06-04 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * block.xsl: Made blockquote indent more reasonable
+ |
+ | * graphics.xsl: Omit the url() wrapper around external-graphic
+ | srcs for FOP and PT
+ |
+
+Changes to docbook/html/*
+
+ | 2001-06-13 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * chunk-common.xsl: Make sure the root element gets processed
+ | correctly so that it generates the right titlepage
+ |
+ | * component.xsl: Don't output ID attributes on DIVs with
+ | required titles since they conflict with the NAME attributes
+ | on the subsequently output A tags.
+ |
+ | * docbook.xsl: Pass the current node to user.head.content
+ |
+ | * index.xsl: Updated comment
+ |
+ | 2001-06-07 Jirka Kosek <kosek@users.sourceforge.net>
+ |
+ | * lists.xsl: Things preceding steps in procedure are placed
+ | before OL list.
+ |
+ | 2001-06-04 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * lists.xsl: Fixed typo in compact list support; backed out
+ | procedure step changes
+ |
+ | * sections.xsl: Fixed CSS typo; clear: all should be clear:
+ | both
+ |
+ | 2001-06-02 Jirka Kosek <kosek@users.sourceforge.net>
+ |
+ | * lists.xsl: Fixed bug #424926. Things preceding steps in
+ | procedure are not placed inside OL list.
+ |
+
+Changes to docbook/extensions/saxon63/com/nwalsh/saxon/*
+
+ | 2001-06-13 Norman Walsh <nwalsh@users.sourceforge.net>
+ |
+ | * Table.java: Fix API for Saxon 6.3; I missed one
+ |
+
diff --git a/tests/docbook/common/ChangeLog b/tests/docbook/common/ChangeLog
index e5cc9d50..812bdf8b 100644
--- a/tests/docbook/common/ChangeLog
+++ b/tests/docbook/common/ChangeLog
@@ -1,98 +1,69 @@
-2001-01-30 Norman Walsh <ndw@nwalsh.com>
+2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
- * en.xml: Added index symbols entry
+ * subtitles.xsl: Support subtitle on article
-2001-01-28 Norman Walsh <ndw@nwalsh.com>
+2001-05-23 Norman Walsh <nwalsh@users.sourceforge.net>
- * common.xsl: Support suppressing anchors in referenced titles; support imageobjectco
+ * common.xsl: Fix dup. template bug with is.graphic.*
- * hu.xml: Tweak chapter title xref template
+ * gentext.xsl: Workaround article/appendix formatting bug (HACK)
-2001-01-07 Norman Walsh <ndw@nwalsh.com>
+ * labels.xsl: Label appendixes correctly in books and articles
- * common.xsl: Added 'Chapter' and 'Appendix' to the gentext for chapter and appendix titles
+2001-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
- * et.xml, hu.xml, id.xml, ko.xml, sl.xml: Added dingbats
+ * labels.xsl: Tweak for section labels in articles
- * l10n.xml, zh_tw.xml: Added traditional Chinese
+2001-05-12 Norman Walsh <nwalsh@users.sourceforge.net>
- * l10n.xsl: Generalized 'gentext.element.name' to 'gentext' with key parameter
+ * common.xsl: Added refsect* to the section.level template
-2000-12-14 Norman Walsh <ndw@nwalsh.com>
+2001-05-04 Norman Walsh <nwalsh@users.sourceforge.net>
- * it.xml: Updated
+ * .cvsignore, Makefile, l10n.xml: Add Serbian localization
-2000-11-29 Norman Walsh <ndw@nwalsh.com>
+2001-04-21 Norman Walsh <nwalsh@users.sourceforge.net>
- * l10n.xsl: Changed variables to parameters
+ * common.xsl: My first crude attempts at support for qandaset
-2000-11-05 Norman Walsh <ndw@nwalsh.com>
+2001-04-19 Norman Walsh <nwalsh@users.sourceforge.net>
- * nl.xml: Updates
+ * gentext.xsl, titles.xsl: Fix bug #417193, make sure allow-anchors is properly propagated through substitute-markup
-2000-11-03 Norman Walsh <ndw@nwalsh.com>
+2001-04-18 Norman Walsh <nwalsh@users.sourceforge.net>
- * common.xsl: Parameterize wrappers around the parts of a title.ref
+ * titles.xsl: Suppress indexterms in no.anchor.mode
-2000-11-02 Norman Walsh <ndw@nwalsh.com>
+2001-04-17 Norman Walsh <nwalsh@users.sourceforge.net>
- * common.xsl: Remove HTML spans from common.xsl; that needs to be supported some other way (in the HTML stylesheets)
+ * labels.xsl: Move label.from.part parameter into param.xsl; default it to 0 so that chapters and appendixes are numbered monotonically throughout a book by default. Moved param.xsl up in the include list, just for good measure
-2000-10-30 Norman Walsh <ndw@nwalsh.com>
+2001-04-16 Norman Walsh <nwalsh@users.sourceforge.net>
- * common.xsl: Don't put the span around the label if text-only is true
+ * gentext.xsl: Fix bug in processing of subtitle content
-2000-10-29 Norman Walsh <ndw@nwalsh.com>
+ * labels.xsl: Only label.from.part if there actually is a part
- * common.xsl: Added label.this.section template to provide more specific control of section labelling; added spans around labels and titles for CSS styling
+ * titles.xsl: Don't put ulink, link, olink, or xref in titles if anchor's aren't allowed
- * en.xml: Make dingbat quotes curly
+2001-04-15 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-10-27 Norman Walsh <ndw@nwalsh.com>
+ * gentext.xsl: Localize the textonly calculations by creating a object.title.markup.textonly mode
- * cs.xml: Updates
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-10-26 Norman Walsh <ndw@nwalsh.com>
+ * gentext.xsl, labels.xsl, titles.xsl: Fix bug 412487, make XSL-generated callout marks honor callout mark parameters
- * common.xsl: Changed text-only parameter to 0/1 from true()/false()
+ * titles.xsl: Restore no.anchor.mode and suppress footnotes in no.anchor.mode
- * hu.xml: Updated
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
- * ko.xml: New file.
+ * .cvsignore, Makefile: New file.
- * l10n.xml: Added Korean
-
- * l10n.xsl: Handle empty gentext
-
- * l10n.xsl: Fixed serious bug in gentext.element.name
-
-2000-10-23 Norman Walsh <ndw@nwalsh.com>
-
- * ca.xml, cs.xml, da.xml, de.xml, el.xml, es.xml, et.xml, fi.xml, fr.xml, hu.xml, id.xml, it.xml, ja.xml, no.xml, pl.xml, pt.xml, pt_br.xml, ro.xml, ru.xml, sk.xml, sl.xml, sv.xml:
- Fixed localization key errors and missing xrefs (thanks to Eva a Pavel ZAMPACHOVI)
-
-2000-10-19 Norman Walsh <ndw@nwalsh.com>
-
- * common.xsl: Documentation changes
-
-2000-10-17 Norman Walsh <ndw@nwalsh.com>
-
- * common.xsl: Updated documentation
-
-2000-10-16 Norman Walsh <ndw@nwalsh.com>
-
- * common.xsl: Added doc:reference
-
-2000-10-14 Norman Walsh <ndw@nwalsh.com>
-
- * common.xsl: Added filename-basename, select.mediaobject, and is.acceptable.mediaobject
-
- * cs.xml: Updates
-
-2000-10-09 Norman Walsh <ndw@nwalsh.com>
-
- * LostLog, ca.xml, common.xsl, cs.xml, da.xml, de.xml, el.xml, en.xml, es.xml, et.xml, fi.xml, fr.xml, hu.xml, id.xml, it.xml, ja.xml, l10n.dtd, l10n.xml, l10n.xsl, nl.xml, no.xml, pl.xml, pt.xml, pt_br.xml, ro.xml, ru.xml, sk.xml, sl.xml, sv.xml, zh_cn.xml:
+ * common.xsl, gentext.xsl, l10n.xml, l10n.xsl, labels.xsl, subtitles.xsl, titles.xsl:
New file.
- * common.xsl: Output '.' between section numbers
+ * gentext.xsl: Commented out debugging messages
+
+ * l10n.dtd: New file.
diff --git a/tests/docbook/common/ca.xml b/tests/docbook/common/ca.xml
index fec3efff..2ba30f9c 100644
--- a/tests/docbook/common/ca.xml
+++ b/tests/docbook/common/ca.xml
@@ -1,100 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="ca">
-<gentext key="abstract" text="Resum"/>
-<gentext key="appendix" text="Ap&#x00E8;ndix"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Llibre"/>
-<gentext key="caution" text="ATENCI&#x00D3;"/>
-<gentext key="caution" text="Atenci&#x00F3;"/>
-<gentext key="chapter" text="Cap&#x00ED;tol"/>
-<gentext key="copyright" text="Dret de reproducci&#x00F3;"/>
-<gentext key="dedication" text="Dedicat&#x00F2;ria"/>
-<gentext key="edition" text="Edici&#x00F3;"/>
-<gentext key="equation" text="Equaci&#x00F3;"/>
-<gentext key="example" text="Exemple"/>
-<gentext key="figure" text="Figura"/>
-<gentext key="glosssee" text="Veure"/>
-<gentext key="glossseealso" text="Veure tamb&#x00E9;"/>
-<gentext key="glossary" text="Glossari"/>
-<gentext key="important" text="IMPORTANT"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Important"/>
-<gentext key="index" text="&#x00CD;ndex alfab&#x00E8;tic"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="Audi&#x00E8;ncia"/>
-<gentext key="msglevel" text="Nivell"/>
-<gentext key="msgorig" text="Origen"/>
-<gentext key="note" text="NOTA"/>
-<gentext key="note" text="Nota"/>
-<gentext key="part" text="Part"/>
-<gentext key="preface" text="Prefaci"/>
-<gentext key="procedure" text="Procediment"/>
-<gentext key="pubdate" text="Data de publicaci&#x00F3;"/>
-<gentext key="published" text="Data de publicaci&#x00F3;"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Refer&#x00E8;ncia"/>
-<gentext key="refname" text="Nom"/>
-<gentext key="revision" text="Revisi&#x00F3;"/>
-<gentext key="revhistory" text="Historial de revisions"/>
-<gentext key="section" text="Secci&#x00F3;"/>
-<gentext key="see" text="Veure"/>
-<gentext key="seealso" text="Veure tambi&#x00E9;"/>
-<gentext key="set" text="Conjunt"/>
-<gentext key="setindex" text="&#x00CD;ndex del conjunt"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Pas"/>
-<gentext key="tip" text="SUGGERIMENT"/>
-<gentext key="table" text="Taula"/>
-<gentext key="tip" text="Suggeriment"/>
-<gentext key="warning" text="AV&#x00CD;S"/>
-<gentext key="warning" text="Av&#x00ED;s"/>
-<gentext key="appendix" text="ap&#x00E8;ndex"/>
-<gentext key="chapter" text="cap&#x00ED;tol"/>
-<gentext key="section" text="secci&#x00F3;"/>
-<gentext key="sidebar" text="glossa"/>
-<gentext key="step" text="pas"/>
-<gentext key="seealso" text="Veure tamb&#x00E9;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Sumari"/>
-<gentext key="in" text="a"/>
-<gentext key="by" text="per"/>
-<gentext key="Edited" text="Editat"/>
-<gentext key="Editedby" text="Editat per"/>
-<gentext key="and" text="i"/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="nonexistantelement" text="element inexistent"/>
-<gentext key="Pgs" text="P&#x00E0;gs."/>
-<gentext key="unsupported" text="no reconeguda"/>
-<gentext key="xrefto" text="xref a"/>
-<gentext key="unexpectedelementname" text="Nom d'element no esperat"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Resum"/>
+ <gentext key="abstract" text="Resum"/>
+ <gentext key="Answer" text="Answer"/>
+ <gentext key="answer" text="Answer"/>
+ <gentext key="Appendix" text="Ap&#232;ndix"/>
+ <gentext key="Article" text="Article"/>
+ <gentext key="article" text="Article"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Llibre"/>
+ <gentext key="book" text="Llibre"/>
+ <gentext key="CAUTION" text="ATENCI&#211;"/>
+ <gentext key="caution" text="ATENCI&#211;"/>
+ <gentext key="Caution" text="Atenci&#243;"/>
+ <gentext key="caution" text="Atenci&#243;"/>
+ <gentext key="Chapter" text="Cap&#237;tol"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Dret de reproducci&#243;"/>
+ <gentext key="copyright" text="Dret de reproducci&#243;"/>
+ <gentext key="Dedication" text="Dedicat&#242;ria"/>
+ <gentext key="dedication" text="Dedicat&#242;ria"/>
+ <gentext key="Edition" text="Edici&#243;"/>
+ <gentext key="edition" text="Edici&#243;"/>
+ <gentext key="Equation" text="Equaci&#243;"/>
+ <gentext key="equation" text="Equaci&#243;"/>
+ <gentext key="Example" text="Exemple"/>
+ <gentext key="example" text="Exemple"/>
+ <gentext key="Figure" text="Figura"/>
+ <gentext key="figure" text="Figura"/>
+ <gentext key="GlossSee" text="Veure"/>
+ <gentext key="glosssee" text="Veure"/>
+ <gentext key="GlossSeeAlso" text="Veure tamb&#233;"/>
+ <gentext key="glossseealso" text="Veure tamb&#233;"/>
+ <gentext key="Glossary" text="Glossari"/>
+ <gentext key="glossary" text="Glossari"/>
+ <gentext key="IMPORTANT" text="IMPORTANT"/>
+ <gentext key="important" text="IMPORTANT"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Important"/>
+ <gentext key="important" text="Important"/>
+ <gentext key="Index" text="&#205;ndex alfab&#232;tic"/>
+ <gentext key="index" text="&#205;ndex alfab&#232;tic"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="Audi&#232;ncia"/>
+ <gentext key="msgaud" text="Audi&#232;ncia"/>
+ <gentext key="MsgLevel" text="Nivell"/>
+ <gentext key="msglevel" text="Nivell"/>
+ <gentext key="MsgOrig" text="Origen"/>
+ <gentext key="msgorig" text="Origen"/>
+ <gentext key="NOTE" text="NOTA"/>
+ <gentext key="note" text="NOTA"/>
+ <gentext key="Note" text="Nota"/>
+ <gentext key="note" text="Nota"/>
+ <gentext key="Part" text="Part"/>
+ <gentext key="part" text="Part"/>
+ <gentext key="Preface" text="Prefaci"/>
+ <gentext key="preface" text="Prefaci"/>
+ <gentext key="Procedure" text="Procediment"/>
+ <gentext key="procedure" text="Procediment"/>
+ <gentext key="PubDate" text="Data de publicaci&#243;"/>
+ <gentext key="pubdate" text="Data de publicaci&#243;"/>
+ <gentext key="Published" text="Data de publicaci&#243;"/>
+ <gentext key="published" text="Data de publicaci&#243;"/>
+ <gentext key="Question" text="Question"/>
+ <gentext key="question" text="Question"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Refer&#232;ncia"/>
+ <gentext key="reference" text="Refer&#232;ncia"/>
+ <gentext key="RefName" text="Nom"/>
+ <gentext key="refname" text="Nom"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Revisi&#243;"/>
+ <gentext key="revision" text="Revisi&#243;"/>
+ <gentext key="RevHistory" text="Historial de revisions"/>
+ <gentext key="revhistory" text="Historial de revisions"/>
+ <gentext key="Section" text="Secci&#243;"/>
+ <gentext key="See" text="Veure"/>
+ <gentext key="see" text="Veure"/>
+ <gentext key="SeeAlso" text="Veure tambi&#233;"/>
+ <gentext key="seealso" text="Veure tambi&#233;"/>
+ <gentext key="Set" text="Conjunt"/>
+ <gentext key="set" text="Conjunt"/>
+ <gentext key="SetIndex" text="&#205;ndex del conjunt"/>
+ <gentext key="setindex" text="&#205;ndex del conjunt"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Pas"/>
+ <gentext key="TIP" text="SUGGERIMENT"/>
+ <gentext key="tip" text="SUGGERIMENT"/>
+ <gentext key="Table" text="Taula"/>
+ <gentext key="table" text="Taula"/>
+ <gentext key="Tip" text="Suggeriment"/>
+ <gentext key="tip" text="Suggeriment"/>
+ <gentext key="WARNING" text="AV&#205;S"/>
+ <gentext key="warning" text="AV&#205;S"/>
+ <gentext key="Warning" text="Av&#237;s"/>
+ <gentext key="warning" text="Av&#237;s"/>
+ <gentext key="appendix" text="ap&#232;ndex"/>
+ <gentext key="chapter" text="cap&#237;tol"/>
+ <gentext key="section" text="secci&#243;"/>
+ <gentext key="sidebar" text="glossa"/>
+ <gentext key="step" text="pas"/>
+ <gentext key="Seealso" text="Veure tamb&#233;"/>
+ <gentext key="seealso" text="Veure tamb&#233;"/>
+ <gentext key="TableofContents" text="Sumari"/>
+ <gentext key="tableofcontents" text="Sumari"/>
+ <gentext key="in" text="a"/>
+ <gentext key="by" text="per"/>
+ <gentext key="Edited" text="Editat"/>
+ <gentext key="edited" text="Editat"/>
+ <gentext key="Editedby" text="Editat per"/>
+ <gentext key="editedby" text="Editat per"/>
+ <gentext key="and" text="i"/>
+ <gentext key="Notes" text="Notes"/>
+ <gentext key="notes" text="Notes"/>
+ <gentext key="TableNotes" text="Notes"/>
+ <gentext key="tablenotes" text="Notes"/>
+ <gentext key="nonexistantelement" text="element inexistent"/>
+ <gentext key="Pgs" text="P&#224;gs."/>
+ <gentext key="pgs" text="P&#224;gs."/>
+ <gentext key="unsupported" text="no reconeguda"/>
+ <gentext key="xrefto" text="xref a"/>
+ <gentext key="unexpectedelementname" text="Nom d'element no esperat"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="&#205;ndex de taules"/>
+ <gentext key="listoftables" text="&#205;ndex de taules"/>
+ <gentext key="ListofExamples" text="&#205;ndex d'exemples"/>
+ <gentext key="listofexamples" text="&#205;ndex d'exemples"/>
+ <gentext key="ListofFigures" text="&#205;ndex de figures"/>
+ <gentext key="listoffigures" text="&#205;ndex de figures"/>
+ <gentext key="ListofEquations" text="&#205;ndex d'equacions"/>
+ <gentext key="listofequations" text="&#205;ndex d'equacions"/>
+ <gentext key="ListofUnknown" text="&#205;ndex de desconegut ?"/>
+ <gentext key="listofunknown" text="&#205;ndex de desconegut ?"/>
+ <gentext key="nav-prev" text="Anterior"/>
+ <gentext key="nav-prev-sibling" text="Retrocedir"/>
+ <gentext key="nav-next-sibling" text="Avancar"/>
+ <gentext key="nav-next" text="Seguent"/>
+ <gentext key="nav-up" text="Pujar"/>
+ <gentext key="nav-home" text="Inici"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="&#x00CD;ndex de taules"/>
-<gentext key="ListofExamples" text="&#x00CD;ndex d'exemples"/>
-<gentext key="ListofFigures" text="&#x00CD;ndex de figures"/>
-<gentext key="ListofEquations" text="&#x00CD;ndex d'equacions"/>
-<gentext key="ListofUnknown" text="&#x00CD;ndex de desconegut ?"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Ap&#232;ndix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Cap&#237;tol %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Equaci&#243; %n. %t"/>
+ <template name="example" text="Exemple %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Part %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Taula %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Anterior"/>
-<gentext key="nav-prev-sibling" text="Retrocedir"/>
-<gentext key="nav-next-sibling" text="Avancar"/>
-<gentext key="nav-next" text="Seguent"/>
-<gentext key="nav-up" text="Pujar"/>
-<gentext key="nav-home" text="Inici"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Ap&#232;ndix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Cap&#237;tol %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exemple %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Part %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Taula %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Secci&#243; %n"/>
+ <template name="sect2" text="Secci&#243; %n"/>
+ <template name="sect3" text="Secci&#243; %n"/>
+ <template name="sect4" text="Secci&#243; %n"/>
+ <template name="sect5" text="Secci&#243; %n"/>
+ <template name="section" text="Secci&#243; %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" i "/>
+ <template name="seplast" text=", i "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Veure "/>
+ <template name="seealso" text="Veure tamb&#233; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Nivell: "/>
+ <template name="MsgOrig" text="Origen: "/>
+ <template name="MsgAud" text="Audi&#232;ncia: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/common.xsl b/tests/docbook/common/common.xsl
index c8b905f1..b9901a68 100644
--- a/tests/docbook/common/common.xsl
+++ b/tests/docbook/common/common.xsl
@@ -224,6 +224,9 @@ Defaults to the context node.</para>
<xsl:otherwise>2</xsl:otherwise>
</xsl:choose>
</xsl:when>
+ <xsl:when test="name($node)='refsect1'">2</xsl:when>
+ <xsl:when test="name($node)='refsect2'">3</xsl:when>
+ <xsl:when test="name($node)='refsect3'">4</xsl:when>
<xsl:when test="name($node)='simplesect'">
<xsl:choose>
<xsl:when test="$node/../../sect1">3</xsl:when>
@@ -291,6 +294,109 @@ Defaults to the context node.</para>
<xsl:value-of select="count($anc.divs) + number($section.level)"/>
</xsl:template>
+<xsl:template name="question.answer.label">
+ <xsl:variable name="deflabel">
+ <xsl:choose>
+ <xsl:when test="ancestor-or-self::*[@defaultlabel]">
+ <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
+ /@defaultlabel"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="qanda.defaultlabel"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="label" select="@label"/>
+
+<!--
+ (hnr (hierarchical-number-recursive (normalize "qandadiv")
+ node))
+
+ (parsect (ancestor-member node (section-element-list)))
+
+ (defnum (if (and %qanda-inherit-numeration%
+ %section-autolabel%)
+ (if (node-list-empty? parsect)
+ (section-autolabel-prefix node)
+ (section-autolabel parsect))
+ ""))
+
+ (hnumber (let loop ((numlist hnr) (number defnum)
+ (sep (if (equal? defnum "") "" ".")))
+ (if (null? numlist)
+ number
+ (loop (cdr numlist)
+ (string-append number
+ sep
+ (number->string (car numlist)))
+ "."))))
+ (cnumber (child-number (parent node)))
+ (number (string-append hnumber
+ (if (equal? hnumber "")
+ ""
+ ".")
+ (number->string cnumber))))
+-->
+
+ <xsl:choose>
+ <xsl:when test="$deflabel = 'qanda'">
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'question'">Question</xsl:when>
+ <xsl:when test="local-name(.) = 'question'">Answer</xsl:when>
+ <xsl:when test="local-name(.) = 'qandadiv'">QandADiv</xsl:when>
+ <xsl:otherwise>QandASet</xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$deflabel = 'label'">
+ <xsl:value-of select="$label"/>
+ </xsl:when>
+ <xsl:when test="$deflabel = 'number'
+ and local-name(.) = 'question'">
+ <xsl:apply-templates select="ancestor::qandaset[1]"
+ mode="number"/>
+ <xsl:choose>
+ <xsl:when test="ancestor::qandadiv">
+ <xsl:apply-templates select="ancestor::qandadiv[1]"
+ mode="number"/>
+ <xsl:apply-templates select="ancestor::qandaentry"
+ mode="number"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="ancestor::qandaentry"
+ mode="number"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- nothing -->
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="qandaset" mode="number">
+ <!-- FIXME: -->
+</xsl:template>
+
+<xsl:template match="qandadiv" mode="number">
+ <xsl:number level="multiple" from="qandaset" format="1."/>
+</xsl:template>
+
+<xsl:template match="qandaentry" mode="number">
+ <xsl:choose>
+ <xsl:when test="ancestor::qandadiv">
+ <xsl:number level="single" from="qandadiv" format="1."/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number level="single" from="qandaset" format="1."/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
<!-- ====================================================================== -->
<xsl:template name="object.id">
@@ -374,21 +480,39 @@ Defaults to the context node.</para>
or
John Doe, Jane Doe, and A. Nonymous
-->
- <xsl:param name="person.list" select="./author|./corpauthor|./othercredit|./editor"/>
+ <xsl:param name="person.list"
+ select="./author|./corpauthor|./othercredit|./editor"/>
<xsl:param name="person.count" select="count($person.list)"/>
<xsl:param name="count" select="1"/>
<xsl:choose>
- <xsl:when test="$count>$person.count"></xsl:when>
+ <xsl:when test="$count &gt; $person.count"></xsl:when>
<xsl:otherwise>
<xsl:call-template name="person.name">
<xsl:with-param name="node" select="$person.list[position()=$count]"/>
</xsl:call-template>
- <xsl:if test="$count&lt;$person.count">
- <xsl:if test="$person.count>2">,</xsl:if>
- <xsl:text> </xsl:text>
- </xsl:if>
- <xsl:if test="$count+1=$person.count">and </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="$person.count = 2 and $count = 1">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'authorgroup'"/>
+ <xsl:with-param name="name" select="'sep2'"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'authorgroup'"/>
+ <xsl:with-param name="name" select="'seplast'"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$count &lt; $person.count">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'authorgroup'"/>
+ <xsl:with-param name="name" select="'sep'"/>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:call-template name="person.name.list">
<xsl:with-param name="person.list" select="$person.list"/>
<xsl:with-param name="person.count" select="$person.count"/>
@@ -418,1043 +542,8 @@ Defaults to the context node.</para>
<xsl:variable name="cmdsynopsis.hanging.indent">4pi</xsl:variable>
<!-- ====================================================================== -->
-<!-- label content -->
-
-<doc:mode mode="label.content" xmlns="">
-<refpurpose>Provides access to element labels</refpurpose>
-<refdescription>
-<para>Processing an element in the
-<literal role="mode">label.content</literal> mode produces the
-element label.</para>
-<para>If the label is non-null, either because the
-<sgmltag class="attribute">label</sgmltag> attribute was present on the
-element or the stylesheet automatically generated a label, trailing
-punctuation is automatically added.</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="label.content">
- <xsl:message>
- <xsl:text>Request for label of unexpected element: </xsl:text>
- <xsl:value-of select="name(.)"/>
- </xsl:message>
-</xsl:template>
-
-<xsl:template match="set|book" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:if test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="part" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$part.autolabel != 0">
- <xsl:number from="book" count="part" format="I"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="preface" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$preface.autolabel != 0">
- <xsl:number from="book" count="preface" format="1" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$chapter.autolabel != 0">
- <xsl:number from="book" count="chapter" format="1" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="appendix" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$chapter.autolabel != 0">
- <xsl:number from="book" count="appendix" format="A" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:if test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:if test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$part.autolabel != 0">
- <xsl:number from="book" count="reference" format="I" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refentry" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:if test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="section" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
-
- <!-- if this is a nested section, label the parent -->
- <xsl:if test="local-name(..) = 'section'">
- <xsl:apply-templates select=".." mode="label.content">
- <xsl:with-param name="punct">.</xsl:with-param>
- </xsl:apply-templates>
- </xsl:if>
-
- <!-- if the parent is a component, maybe label that too -->
- <xsl:variable name="parent.is.component">
- <xsl:call-template name="is.component">
- <xsl:with-param name="node" select=".."/>
- </xsl:call-template>
- </xsl:variable>
-
- <!-- does this section get labelled? -->
- <xsl:variable name="label">
- <xsl:call-template name="label.this.section">
- <xsl:with-param name="section" select="."/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:if test="$section.label.includes.component.label != 0
- and $parent.is.component != 0">
- <xsl:apply-templates select=".." mode="label.content">
- <xsl:with-param name="punct">.</xsl:with-param>
- </xsl:apply-templates>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$label != 0">
- <xsl:number count="section"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
-
- <!-- if the parent is a component, maybe label that too -->
- <xsl:variable name="parent.is.component">
- <xsl:call-template name="is.component">
- <xsl:with-param name="node" select=".."/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="$section.label.includes.component.label != 0
- and $parent.is.component">
- <xsl:apply-templates select=".." mode="label.content">
- <xsl:with-param name="punct">.</xsl:with-param>
- </xsl:apply-templates>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$section.autolabel != 0">
- <xsl:number count="sect1"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect2|sect3|sect4|sect5" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
-
- <!-- label the parent -->
- <xsl:apply-templates select=".." mode="label.content">
- <xsl:with-param name="punct">.</xsl:with-param>
- </xsl:apply-templates>
-
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$section.autolabel != 0">
- <xsl:choose>
- <xsl:when test="local-name(.) = 'sect2'">
- <xsl:number count="sect2"/>
- </xsl:when>
- <xsl:when test="local-name(.) = 'sect3'">
- <xsl:number count="sect3"/>
- </xsl:when>
- <xsl:when test="local-name(.) = 'sect4'">
- <xsl:number count="sect4"/>
- </xsl:when>
- <xsl:when test="local-name(.) = 'sect5'">
- <xsl:number count="sect5"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message>label.content: this can't happen!</xsl:message>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refsect1|refsect2|refsect3" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$section.autolabel != 0">
- <xsl:number level="multiple" count="refsect1|refsect2|refsect3"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="simplesect" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$section.autolabel != 0">
- <xsl:number level="multiple" count="section
- |sect1|sect2|sect3|sect4|sect5
- |refsect1|refsect2|refsect3
- |simplesect"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:variable name="prefix">
- <xsl:if test="$qanda.inherit.numeration != 0">
- <xsl:variable name="lparent" select="(ancestor::set
- |ancestor::book
- |ancestor::chapter
- |ancestor::appendix
- |ancestor::preface
- |ancestor::section
- |ancestor::simplesect
- |ancestor::sect1
- |ancestor::sect2
- |ancestor::sect3
- |ancestor::sect4
- |ancestor::sect5
- |ancestor::refsect1
- |ancestor::refsect2
- |ancestor::refsect3)[last()]"/>
- <xsl:if test="count($lparent)>0">
- <xsl:apply-templates select="$lparent" mode="label.content"/>
- </xsl:if>
- </xsl:if>
- </xsl:variable>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="$prefix"/>
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:when test="$qandadiv.autolabel != 0">
- <xsl:value-of select="$prefix"/>
- <xsl:number level="multiple" count="qandadiv" format="1"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:variable name="prefix">
- <xsl:if test="$qanda.inherit.numeration != 0">
- <xsl:variable name="lparent" select="(ancestor::set
- |ancestor::book
- |ancestor::chapter
- |ancestor::appendix
- |ancestor::preface
- |ancestor::section
- |ancestor::simplesect
- |ancestor::sect1
- |ancestor::sect2
- |ancestor::sect3
- |ancestor::sect4
- |ancestor::sect5
- |ancestor::refsect1
- |ancestor::refsect2
- |ancestor::refsect3
- |ancestor::qandadiv)[last()]"/>
- <xsl:if test="count($lparent)>0">
- <xsl:apply-templates select="$lparent" mode="label.content"/>
- </xsl:if>
- </xsl:if>
- </xsl:variable>
-
- <xsl:variable name="inhlabel"
- select="ancestor-or-self::qandaset/@defaultlabel[1]"/>
-
- <xsl:variable name="deflabel">
- <xsl:choose>
- <xsl:when test="$inhlabel != ''">
- <xsl:value-of select="$inhlabel"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$qanda.defaultlabel"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="label" select="label"/>
-
- <xsl:choose>
- <xsl:when test="count($label)>0">
- <xsl:value-of select="$prefix"/>
- <xsl:apply-templates select="$label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
-
- <xsl:when test="$deflabel = 'qanda'">
- <xsl:call-template name="gentext.element.name"/>
- </xsl:when>
-
- <xsl:when test="$deflabel = 'number'">
- <xsl:if test="name(.) = 'question'">
- <xsl:value-of select="$prefix"/>
- <xsl:number level="multiple" count="qandaentry" format="1"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary|index" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:if test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
- <xsl:choose>
- <xsl:when test="@label">
- <xsl:value-of select="@label"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="pchap"
- select="ancestor::chapter|ancestor::appendix"/>
- <xsl:choose>
- <xsl:when test="count($pchap)>0">
- <xsl:apply-templates select="$pchap" mode="label.content">
- <xsl:with-param name="punct">.</xsl:with-param>
- </xsl:apply-templates>
- <xsl:number format="1" from="chapter|appendix" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:number format="1" from="book|article" level="any"/>
- <xsl:value-of select="$punct"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="abstract" mode="label.content">
- <xsl:param name="punct">.</xsl:param>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="label.this.section">
- <xsl:param name="section" select="."/>
- <xsl:value-of select="$section.autolabel"/>
-</xsl:template>
-
-<doc:template name="label.this.section" xmlns="">
-<refpurpose>Returns true if $section should be labelled</refpurpose>
-<refdescription>
-<para>Returns true if the specified section should be labelled.
-By default, this template simply returns $section.autolabel, but
-custom stylesheets may override it to get more selective behavior.</para>
-</refdescription>
-</doc:template>
-
-<!-- ====================================================================== -->
-<!-- title content -->
-
-<doc:mode mode="title.content" xmlns="">
-<refpurpose>Provides access to element titles</refpurpose>
-<refdescription>
-<para>Processing an element in the
-<literal role="mode">title.content</literal> mode produces the
-title of the element. This does not include the label. If
-<parameter>text-only</parameter> is true, the text of the title
-is returned, without inline markup, otherwise inline markup is processed
-(in the default mode). By default, <parameter>text-only</parameter>
-is false.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title[1]" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message>
- <xsl:text>Request for title of unexpected element: </xsl:text>
- <xsl:value-of select="name(.)"/>
- </xsl:message>
- <xsl:text>???TITLE???</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="no.anchor.mode">
- <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="anchor" mode="no.anchor.mode">
- <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="title" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="$text-only != 0">
- <xsl:value-of select="."/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$allow-anchors != 0">
- <xsl:apply-templates/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates mode="no.anchor.mode"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="set" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(setinfo/title|title)[1]"
- mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(bookinfo/title|title)[1]"
- mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(partinfo/title|docinfo/title|title)[1]"
- mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:variable name="title" select="(docinfo/title
- |prefaceinfo/title
- |chapterinfo/title
- |appendixinfo/title
- |title)[1]"/>
- <xsl:choose>
- <xsl:when test="$title">
- <xsl:apply-templates select="$title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="name(.)"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="name(.)"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:variable name="title" select="(artheader/title
- |articleinfo/title
- |title)[1]"/>
-
- <xsl:apply-templates select="$title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(referenceinfo/title|docinfo/title|title)[1]"
- mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:variable name="refmeta" select=".//refmeta"/>
- <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
- <xsl:variable name="refnamediv" select=".//refnamediv"/>
- <xsl:variable name="refname" select="$refnamediv//refname"/>
-
- <xsl:variable name="title">
- <xsl:choose>
- <xsl:when test="$refentrytitle">
- <xsl:apply-templates select="$refentrytitle[1]" mode="title.content"/>
- </xsl:when>
- <xsl:when test="$refname">
- <xsl:apply-templates select="$refname[1]" mode="title.content"/>
- </xsl:when>
- <xsl:otherwise>REFENTRY WITHOUT TITLE???</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when test="$text-only != 0">
- <xsl:value-of select="$title"/>
- </xsl:when>
- <xsl:otherwise><xsl:copy-of select="$title"/></xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refentrytitle|refname" mode="title.content">
- <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="section
- |sect1|sect2|sect3|sect4|sect5
- |refsect1|refsect2|refsect3
- |simplesect"
- mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:variable name="title" select="(sectioninfo/title
- |sect1info/title
- |sect2info/title
- |sect3info/title
- |sect4info/title
- |sect5info/title
- |refsect1info/title
- |refsect2info/title
- |refsect3info/title
- |title)[1]"/>
-
- <xsl:apply-templates select="$title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary|index" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="name(.)"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="abstract" mode="title.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title" mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="name(.)"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- subtitle content -->
-
-<doc:mode mode="subtitle.content" xmlns="">
-<refpurpose>Provides access to element subtitles</refpurpose>
-<refdescription>
-<para>Processing an element in the
-<literal role="mode">subtitle.content</literal> mode produces the
-subtitle of the element. If
-<parameter>text-only</parameter> is true, the text of the title
-is returned, without inline markup, otherwise inline markup is processed
-(in the default mode). By default, <parameter>text-only</parameter>
-is false.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="subtitle.content">
- <xsl:message>
- <xsl:text>Request for subtitle of unexpected element: </xsl:text>
- <xsl:value-of select="name(.)"/>
- </xsl:message>
- <xsl:text>???SUBTITLE???</xsl:text>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:choose>
- <xsl:when test="$text-only != 0">
- <xsl:value-of select="."/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="set" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(setinfo/subtitle|subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(bookinfo/subtitle|subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(partinfo/subtitle
- |docinfo/subtitle
- |subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(docinfo/subtitle
- |prefaceinfo/subtitle
- |chapterinfo/subtitle
- |appendixinfo/subtitle
- |subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="subtitle"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(referenceinfo/subtitle
- |docinfo/subtitle
- |subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(refentryinfo/subtitle
- |docinfo/subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section
- |sect1|sect2|sect3|sect4|sect5
- |refsect1|refsect2|refsect3
- |simplesect"
- mode="subtitle.content">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:apply-templates select="(sectioninfo/subtitle
- |sect1info/subtitle
- |sect2info/subtitle
- |sect3info/subtitle
- |sect4info/subtitle
- |sect5info/subtitle
- |refsect1info/subtitle
- |refsect2info/subtitle
- |refsect3info/subtitle
- |subtitle)[1]"
- mode="subtitle.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- title reference (label + title) -->
-
-<doc:mode mode="title.ref" xmlns="">
-<refpurpose>Provides reference text for an element</refpurpose>
-<refdescription>
-<para>Processing an element in the
-<literal role="mode">title.ref</literal> mode produces the
-label and title of the element.
-</para>
-</refdescription>
-<refparameter>
-<variablelist>
-<varlistentry><term>text-only</term>
-<listitem>
-<para> If
-<parameter>text-only</parameter> is true, the text of the title
-is returned, without inline markup, otherwise inline markup is processed
-(in the default mode). By default, <parameter>text-only</parameter>
-is false.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>label-wrapper</term>
-<listitem>
-<para>If <parameter>label-wrapper</parameter> is not the emtpy string,
-it must be the name of an element. The element so named will be wrapped
-around labels on output.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>title-wrapper</term>
-<listitem>
-<para>If <parameter>title.wrapper</parameter> is not the emtpy string,
-it must be the name of an element. The element so named will be wrapped
-around titles on output.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>label-wrapper-class</term>
-<listitem>
-<para>If a <parameter>label-wrapper</parameter> is provided and
-<parameter>label-wrapper-class</parameter> is not the emtpy string,
-it be used as the value for a <sgmltag class="attribute">class</sgmltag>
-attribute on the <parameter>label-wrapper</parameter> element.</para>
-<para>This is a dirty hack because it only makes sense for the HTML
-stylesheet (there's no <sgmltag class="attribute">class</sgmltag> attribute
-on the FO elements). What I'd really like to do is pass an attribute
-set as a parameter, but I can't.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>title-wrapper-class</term>
-<listitem>
-<para>If a <parameter>title-wrapper</parameter> is provided and
-<parameter>title-wrapper-class</parameter> is not the emtpy string,
-it be used as the value for a <sgmltag class="attribute">class</sgmltag>
-attribute on the <parameter>title-wrapper</parameter> element.</para>
-<para>This is a dirty hack because it only makes sense for the HTML
-stylesheet (there's no <sgmltag class="attribute">class</sgmltag> attribute
-on the FO elements). What I'd really like to do is pass an attribute
-set as a parameter, but I can't.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-</doc:mode>
-
-<xsl:template match="*" mode="title.ref">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:param name="label-wrapper" select="''"/>
- <xsl:param name="title-wrapper" select="''"/>
- <!-- Dirty hack -->
- <xsl:param name="label-wrapper-class" select="''"/>
- <xsl:param name="title-wrapper-class" select="''"/>
-
- <xsl:variable name="label">
- <xsl:apply-templates select="." mode="label.content"/>
- </xsl:variable>
-
- <xsl:if test="$label != ''">
- <xsl:choose>
- <xsl:when test="$text-only = 0">
- <xsl:choose>
- <xsl:when test="$label-wrapper != ''">
- <xsl:element name="{$label-wrapper}">
- <xsl:if test="$label-wrapper-class != ''">
- <xsl:attribute name="class">
- <xsl:value-of select="$label-wrapper-class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$label"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$label"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text> </xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$label"/>
- <xsl:text> </xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="$text-only = 0">
- <xsl:choose>
- <xsl:when test="$title-wrapper != ''">
- <xsl:element name="{$title-wrapper}">
- <xsl:if test="$title-wrapper-class != ''">
- <xsl:attribute name="class">
- <xsl:value-of select="$title-wrapper-class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation
- |chapter|appendix" mode="title.ref">
- <xsl:param name="text-only" select="'0'"/>
- <xsl:param name="allow-anchors" select="'0'"/>
- <xsl:param name="label-wrapper" select="''"/>
- <xsl:param name="title-wrapper" select="''"/>
- <!-- Dirty hack -->
- <xsl:param name="label-wrapper-class" select="''"/>
- <xsl:param name="title-wrapper-class" select="''"/>
-
- <xsl:variable name="label">
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">
- <xsl:value-of select="name(.)"/>
- </xsl:with-param>
- </xsl:call-template>
- <xsl:call-template name="gentext.space"/>
- <xsl:apply-templates select="." mode="label.content"/>
- </xsl:variable>
-
- <xsl:if test="$label != ''">
- <xsl:choose>
- <xsl:when test="$text-only = 0">
- <xsl:choose>
- <xsl:when test="$label-wrapper != ''">
- <xsl:element name="{$label-wrapper}">
- <xsl:if test="$label-wrapper-class != ''">
- <xsl:attribute name="class">
- <xsl:value-of select="$label-wrapper-class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$label"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$label"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text> </xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$label"/>
- <xsl:text> </xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="$text-only = 0">
- <xsl:choose>
- <xsl:when test="$title-wrapper != ''">
- <xsl:element name="{$title-wrapper}">
- <xsl:if test="$title-wrapper-class != ''">
- <xsl:attribute name="class">
- <xsl:value-of select="$title-wrapper-class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="." mode="title.content">
- <xsl:with-param name="text-only" select="$text-only"/>
- <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
- </xsl:apply-templates>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
+<!--
<xsl:template name="xref.g.subst">
<xsl:param name="string"></xsl:param>
<xsl:param name="target" select="."/>
@@ -1547,6 +636,7 @@ set as a parameter, but I can't.</para>
<xsl:with-param name="target" select="$target"/>
</xsl:call-template>
</xsl:template>
+-->
<!-- ====================================================================== -->
@@ -1759,31 +849,6 @@ object is recognized as a graphic.</para>
</xsl:choose>
</xsl:template>
-<xsl:template name="is.graphic.format">
- <xsl:param name="format"></xsl:param>
- <xsl:if test="$format = 'PNG'
- or $format = 'JPG'
- or $format = 'JPEG'
- or $format = 'linespecific'
- or $format = 'GIF'
- or $format = 'GIF87a'
- or $format = 'GIF89a'
- or $format = 'BMP'">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="is.graphic.extension">
- <xsl:param name="ext"></xsl:param>
- <xsl:if test="$ext = 'png'
- or $ext = 'jpeg'
- or $ext = 'jpg'
- or $ext = 'avi'
- or $ext = 'mpg'
- or $ext = 'mpeg'
- or $ext = 'qt'
- or $ext = 'gif'
- or $ext = 'bmp'">1</xsl:if>
-</xsl:template>
-
<xsl:template name="mediaobject.filename">
<xsl:param name="object"></xsl:param>
@@ -1879,6 +944,12 @@ the ID is not unique.</para>
<xsl:value-of select="$linkend"/>
<xsl:text>.</xsl:text>
</xsl:message>
+ <!--
+ <xsl:message>
+ <xsl:text>If the ID exists in your document, did your </xsl:text>
+ <xsl:text>XSLT Processor load the DTD?</xsl:text>
+ </xsl:message>
+ -->
</xsl:if>
<xsl:if test="count($targets)>1">
diff --git a/tests/docbook/common/cs.xml b/tests/docbook/common/cs.xml
index 42511cee..fc1b2b8a 100644
--- a/tests/docbook/common/cs.xml
+++ b/tests/docbook/common/cs.xml
@@ -1,108 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="cs">
-<!-- Contributors:
- Martin Perina <docbk@ataco.cz>
- Jirka Kosek <jirka@kosek.cz>
--->
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="abstract" text="Abstrakt"/>
-<gentext key="answer" text="Ot&#x00e1;zka:"/>
-<gentext key="appendix" text="P&#x0159;&#x00ed;loha"/>
-<gentext key="article" text="&#x010c;l&#x00e1;nek"/>
-<gentext key="bibliography" text="Bibliografie"/>
-<gentext key="book" text="Kniha"/>
-<gentext key="caution" text="V&#x00fd;straha"/>
-<gentext key="chapter" text="Kapitola"/>
-<gentext key="colophon" text="Tir&#x00e1;&#x017e;"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="V&#x011b;nov&#x00e1;n&#x00ed;"/>
-<gentext key="edition" text="Vyd&#x00e1;n&#x00ed;"/>
-<gentext key="equation" text="Rovnice"/>
-<gentext key="example" text="P&#x0159;&#x00ed;klad"/>
-<gentext key="figure" text="Obr&#x00e1;zek"/>
-<gentext key="glossary" text="Slovn&#x00ed;k"/>
-<gentext key="glosssee" text="Viz"/>
-<gentext key="glossseealso" text="Viz t&#x00e9;&#x017e;"/>
-<gentext key="important" text="D&#x016f;le&#x017e;it&#x00e9;"/>
-<gentext key="index" text="Rejst&#x0159;&#x00ed;k"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="legalnotice" text="Pr&#x00e1;vn&#x00ed; pozn&#x00e1;mka"/>
-<gentext key="msgaud" text="Publikum"/>
-<gentext key="msglevel" text="&#x00da;rove&#x0148;"/>
-<gentext key="msgorig" text="P&#x016f;vod"/>
-<gentext key="note" text="Pozn&#x00e1;mka"/>
-<gentext key="part" text="&#x010c;&#x00e1;st"/>
-<gentext key="preface" text="P&#x0159;edmluva"/>
-<gentext key="procedure" text="Postup"/>
-<gentext key="published" text="Vyd&#x00e1;no"/>
-<gentext key="question" text="Ot&#x00e1;zka:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Odkaz"/>
-<gentext key="refname" text="Jm&#x00e9;no"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="P&#x0159;ehled"/>
-<gentext key="revhistory" text="P&#x0159;ehled reviz&#x00ed;"/>
-<gentext key="revision" text="Revize"/>
-<gentext key="section" text="Odd&#x00ed;l"/>
-<gentext key="sect1" text="Odd&#x00ed;l"/>
-<gentext key="sect2" text="Odd&#x00ed;l"/>
-<gentext key="sect3" text="Odd&#x00ed;l"/>
-<gentext key="sect4" text="Odd&#x00ed;l"/>
-<gentext key="sect5" text="Odd&#x00ed;l"/>
-<gentext key="see" text="Viz"/>
-<gentext key="seealso" text="Viz t&#x00e9;&#x017e;"/>
-<gentext key="set" text="Sada"/>
-<gentext key="setindex" text="Rejst&#x0159;&#x00ed;k sady"/>
-<gentext key="sidebar" text="Margin&#x00e1;lie"/>
-<gentext key="step" text="Krok"/>
-<gentext key="table" text="Tabulka"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="Varov&#x00e1;n&#x00ed;"/>
+ <gentext key="Abstract" text="Abstrakt"/>
+ <gentext key="abstract" text="Abstrakt"/>
+ <gentext key="Answer" text="Odpov&#283;&#271;:"/>
+ <gentext key="answer" text="Odpov&#283;&#271;:"/>
+ <gentext key="Appendix" text="P&#345;&#237;loha"/>
+ <gentext key="appendix" text="P&#345;&#237;loha"/>
+ <gentext key="Article" text="&#268;l&#225;nek"/>
+ <gentext key="article" text="&#268;l&#225;nek"/>
+ <gentext key="Bibliography" text="Bibliografie"/>
+ <gentext key="bibliography" text="Bibliografie"/>
+ <gentext key="Book" text="Kniha"/>
+ <gentext key="book" text="Kniha"/>
+ <gentext key="CAUTION" text="V&#253;straha"/>
+ <gentext key="Caution" text="V&#253;straha"/>
+ <gentext key="caution" text="V&#253;straha"/>
+ <gentext key="Chapter" text="Kapitola"/>
+ <gentext key="chapter" text="Kapitola"/>
+ <gentext key="Colophon" text="Tir&#225;&#382;"/>
+ <gentext key="colophon" text="Tir&#225;&#382;"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="V&#283;nov&#225;n&#237;"/>
+ <gentext key="dedication" text="V&#283;nov&#225;n&#237;"/>
+ <gentext key="Edition" text="Vyd&#225;n&#237;"/>
+ <gentext key="edition" text="Vyd&#225;n&#237;"/>
+ <gentext key="Equation" text="Rovnice"/>
+ <gentext key="equation" text="Rovnice"/>
+ <gentext key="Example" text="P&#345;&#237;klad"/>
+ <gentext key="example" text="P&#345;&#237;klad"/>
+ <gentext key="Figure" text="Obr&#225;zek"/>
+ <gentext key="figure" text="Obr&#225;zek"/>
+ <gentext key="Glossary" text="Slovn&#237;k"/>
+ <gentext key="glossary" text="Slovn&#237;k"/>
+ <gentext key="GlossSee" text="Viz"/>
+ <gentext key="glosssee" text="Viz"/>
+ <gentext key="GlossSeeAlso" text="Viz t&#233;&#382;"/>
+ <gentext key="glossseealso" text="Viz t&#233;&#382;"/>
+ <gentext key="IMPORTANT" text="D&#367;le&#382;it&#233;"/>
+ <gentext key="Important" text="D&#367;le&#382;it&#233;"/>
+ <gentext key="important" text="D&#367;le&#382;it&#233;"/>
+ <gentext key="Index" text="Rejst&#345;&#237;k"/>
+ <gentext key="index" text="Rejst&#345;&#237;k"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="LegalNotice" text="Pr&#225;vn&#237; dolo&#382;ka"/>
+ <gentext key="legalnotice" text="Pr&#225;vn&#237; dolo&#382;ka"/>
+ <gentext key="MsgAud" text="Publikum"/>
+ <gentext key="msgaud" text="Publikum"/>
+ <gentext key="MsgLevel" text="&#218;rove&#328;"/>
+ <gentext key="msglevel" text="&#218;rove&#328;"/>
+ <gentext key="MsgOrig" text="P&#367;vod"/>
+ <gentext key="msgorig" text="P&#367;vod"/>
+ <gentext key="NOTE" text="Pozn&#225;mka"/>
+ <gentext key="Note" text="Pozn&#225;mka"/>
+ <gentext key="note" text="Pozn&#225;mka"/>
+ <gentext key="Part" text="&#268;&#225;st"/>
+ <gentext key="part" text="&#268;&#225;st"/>
+ <gentext key="Preface" text="P&#345;edmluva"/>
+ <gentext key="preface" text="P&#345;edmluva"/>
+ <gentext key="Procedure" text="Postup"/>
+ <gentext key="procedure" text="Postup"/>
+ <gentext key="Published" text="Vyd&#225;no"/>
+ <gentext key="published" text="Vyd&#225;no"/>
+ <gentext key="Question" text="Ot&#225;zka:"/>
+ <gentext key="question" text="Ot&#225;zka:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Odkaz"/>
+ <gentext key="reference" text="Odkaz"/>
+ <gentext key="RefName" text="Jm&#233;no"/>
+ <gentext key="refname" text="Jm&#233;no"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="P&#345;ehled"/>
+ <gentext key="refsynopsisdiv" text="P&#345;ehled"/>
+ <gentext key="RevHistory" text="P&#345;ehled reviz&#237;"/>
+ <gentext key="revhistory" text="P&#345;ehled reviz&#237;"/>
+ <gentext key="Revision" text="Revize"/>
+ <gentext key="revision" text="Revize"/>
+ <gentext key="sect1" text="Odd&#237;l"/>
+ <gentext key="sect2" text="Odd&#237;l"/>
+ <gentext key="sect3" text="Odd&#237;l"/>
+ <gentext key="sect4" text="Odd&#237;l"/>
+ <gentext key="sect5" text="Odd&#237;l"/>
+ <gentext key="Section" text="Odd&#237;l"/>
+ <gentext key="section" text="Odd&#237;l"/>
+ <gentext key="See" text="Viz"/>
+ <gentext key="see" text="Viz"/>
+ <gentext key="SeeAlso" text="Viz t&#233;&#382;"/>
+ <gentext key="Seealso" text="Viz t&#233;&#382;"/>
+ <gentext key="seealso" text="Viz t&#233;&#382;"/>
+ <gentext key="Set" text="Sada"/>
+ <gentext key="set" text="Sada"/>
+ <gentext key="SetIndex" text="Rejst&#345;&#237;k sady"/>
+ <gentext key="setindex" text="Rejst&#345;&#237;k sady"/>
+ <gentext key="Sidebar" text="Margin&#225;lie"/>
+ <gentext key="sidebar" text="Margin&#225;lie"/>
+ <gentext key="Step" text="Krok"/>
+ <gentext key="step" text="krok"/>
+ <gentext key="Table" text="Tabulka"/>
+ <gentext key="table" text="Tabulka"/>
+ <gentext key="TIP" text="Tip"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="Varov&#225;n&#237;"/>
+ <gentext key="Warning" text="Varov&#225;n&#237;"/>
+ <gentext key="warning" text="Varov&#225;n&#237;"/>
+ <gentext key="TableofContents" text="Obsah"/>
+ <gentext key="tableofcontents" text="Obsah"/>
+ <gentext key="in" text="v"/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="Vyd&#225;no"/>
+ <gentext key="edited" text="Vyd&#225;no"/>
+ <gentext key="Editedby" text="Sestavil"/>
+ <gentext key="editedby" text="Sestavil"/>
+ <gentext key="and" text="a"/>
+ <gentext key="Notes" text="Pozn&#225;mky"/>
+ <gentext key="notes" text="Pozn&#225;mky"/>
+ <gentext key="TableNotes" text="Pozn&#225;mky"/>
+ <gentext key="tablenotes" text="Pozn&#225;mky"/>
+ <gentext key="nonexistantelement" text="neexistuj&#237;c&#237; prvek"/>
+ <gentext key="Pgs" text="Str."/>
+ <gentext key="pgs" text="Str."/>
+ <gentext key="unsupported" text="nepodporovan&#253;"/>
+ <gentext key="xrefto" text="xref k"/>
+ <gentext key="unexpectedelementname" text="Neo&#269;ek&#225;van&#233; jm&#233;no prvku"/>
+ <gentext key="Revisedby" text="Revidoval: "/>
+ <gentext key="revisedby" text="Revidoval: "/>
+ <gentext key="ListofTables" text="Seznam tabulek"/>
+ <gentext key="listoftables" text="Seznam tabulek"/>
+ <gentext key="ListofExamples" text="Seznam p&#345;&#237;klad&#367;"/>
+ <gentext key="listofexamples" text="Seznam p&#345;&#237;klad&#367;"/>
+ <gentext key="ListofFigures" text="Seznam obr&#225;zk&#367;"/>
+ <gentext key="listoffigures" text="Seznam obr&#225;zk&#367;"/>
+ <gentext key="ListofEquations" text="Seznam rovnic"/>
+ <gentext key="listofequations" text="Seznam rovnic"/>
+ <gentext key="ListofUnknown" text="Seznam nezn&#225;m&#233;ho"/>
+ <gentext key="listofunknown" text="Seznam nezn&#225;m&#233;ho"/>
+ <gentext key="nav-prev" text="P&#345;edch&#225;zej&#237;c&#237;"/>
+ <gentext key="nav-prev-sibling" text="Rychle zp&#283;t"/>
+ <gentext key="nav-next-sibling" text="Rychle dop&#345;edu"/>
+ <gentext key="nav-next" text="Dal&#353;&#237;"/>
+ <gentext key="nav-up" text="Nahoru"/>
+ <gentext key="nav-home" text="Dom&#367;"/>
+ <gentext key="sectioncalled" text="odd&#237;l nazvan&#253;"/>
+ <dingbat key="startquote" text="&#8222;"/>
+ <dingbat key="endquote" text="&#8220;"/>
+ <dingbat key="nestedstartquote" text="&#8218;"/>
+ <dingbat key="nestedendquote" text="&#8216;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="TableofContents" text="Obsah"/>
-<gentext key="in" text="v"/>
-<gentext key="by" text=" "/>
-<gentext key="Edited" text="Vyd&#x00e1;no"/>
-<gentext key="Editedby" text="Sestavil"/>
-<gentext key="and" text="a"/>
-<gentext key="Notes" text="Pozn&#x00e1;mky"/>
-<gentext key="TableNotes" text="Pozn&#x00e1;mky"/>
-<gentext key="nonexistantelement" text="neexistuj&#x00ed;c&#x00ed; prvek"/>
-<gentext key="Pgs" text="Str."/>
-<gentext key="unsupported" text="nepodporovan&#x00fd;"/>
-<gentext key="xrefto" text="xref k"/>
-<gentext key="unexpectedelementname" text="Neo&#x010d;ek&#x00e1;van&#x00e9; jm&#x00e9;no prvku"/>
-<gentext key="Revisedby" text="Revidoval: "/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="P&#345;&#237;loha %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapitola %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Rovnice %n. %t"/>
+ <template name="example" text="P&#345;&#237;klad %n. %t"/>
+ <template name="figure" text="Obr&#225;zek %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#268;&#225;st %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabulka %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="ListofTables" text="Seznam tabulek"/>
-<gentext key="ListofExamples" text="Seznam p&#x0159;&#x00ed;klad&#x016f;"/>
-<gentext key="ListofFigures" text="Seznam obr&#x00e1;zk&#x016f;"/>
-<gentext key="ListofEquations" text="Seznam rovnic"/>
-<gentext key="ListofUnknown" text="Seznam nezn&#x00e1;m&#x00e9;ho"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="P&#x0159;edch&#x00e1;zej&#x00ed;c&#x00ed;"/>
-<gentext key="nav-prev-sibling" text="Rychle zp&#x011b;t"/>
-<gentext key="nav-next-sibling" text="Rychle dop&#x0159;edu"/>
-<gentext key="nav-next" text="Dal&#x0161;&#x00ed;"/>
-<gentext key="nav-up" text="Nahoru"/>
-<gentext key="nav-home" text="Dom&#x016f;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<gentext key="the section called" text="odd&#x00ed;l nazvan&#x00fd;"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<dingbat key="startquote" text="&#x201e;"/>
-<dingbat key="endquote" text="&#x201c;"/>
-<dingbat key="nestedstartquote" text="&#x201a;"/>
-<dingbat key="nestedendquote" text="&#x2018;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+ <context name="xref">
+ <template name="appendix" text="%n &#8211; &#8222;%t&#8220;"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="%n &#8211; &#8222;%t&#8220;"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="%n"/>
+ <template name="figure" text="%n"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="%n &#8211; &#8222;%t&#8220;"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="%n"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="figure" text="%n"/>
-<xref element="example" text="%n"/>
-<xref element="table" text="%n"/>
+ <context name="section-xref">
+ <template name="sect1" text="&#8222;%t&#8220;"/>
+ <template name="sect2" text="&#8222;%t&#8220;"/>
+ <template name="sect3" text="&#8222;%t&#8220;"/>
+ <template name="sect4" text="&#8222;%t&#8220;"/>
+ <template name="sect5" text="&#8222;%t&#8220;"/>
+ <template name="section" text="&#8222;%t&#8220;"/>
+ <template name="simplesect" text="&#8222;%t&#8220;"/>
+ </context>
+ <context name="section-xref-numbered">
+ <template name="sect1" text="%n"/>
+ <template name="sect2" text="%n"/>
+ <template name="sect3" text="%n"/>
+ <template name="sect4" text="%n"/>
+ <template name="sect5" text="%n"/>
+ <template name="section" text="%n"/>
+ <template name="simplesect" text="&#8222;%t&#8220;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" a "/>
+ <template name="seplast" text=" a "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Viz "/>
+ <template name="seealso" text="Viz t&#233;&#382; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#218;rove&#328;: "/>
+ <template name="MsgOrig" text="P&#367;vod: "/>
+ <template name="MsgAud" text="Publikum: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/da.xml b/tests/docbook/common/da.xml
index 95905023..44083744 100644
--- a/tests/docbook/common/da.xml
+++ b/tests/docbook/common/da.xml
@@ -1,98 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="da">
-<gentext key="abstract" text="Abstract"/>
-<gentext key="appendix" text="Appendiks"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliografi"/>
-<gentext key="book" text="Book"/>
-<gentext key="caution" text="BEM&#198;RK"/>
-<gentext key="caution" text="Bem&#230;rk"/>
-<gentext key="chapter" text="Kapitel"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Tilegnet"/>
-<gentext key="edition" text="Udgave"/>
-<gentext key="equation" text="Ligning"/>
-<gentext key="example" text="Eksempel"/>
-<gentext key="figure" text="Figur"/>
-<gentext key="glosssee" text="Se"/>
-<gentext key="glossseealso" text="Se ogs&#229;"/>
-<gentext key="glossary" text="Stikordregister"/>
-<gentext key="important" text="VIGTIGT"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Vigtigt"/>
-<gentext key="index" text="Index"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="M&#229;lgruppe"/>
-<gentext key="msglevel" text="Niveau"/>
-<gentext key="msgorig" text="Grundlag"/>
-<gentext key="note" text="NOTE"/>
-<gentext key="note" text="Note"/>
-<gentext key="part" text="Del"/>
-<gentext key="preface" text="Forord"/>
-<gentext key="procedure" text="Procedure"/>
-<gentext key="pubdate" text="Udgivet"/>
-<gentext key="published" text="Published"/>
-<gentext key="refname" text="Navn"/>
-<gentext key="reference" text="Reference"/>
-<gentext key="revision" text="Revision"/>
-<gentext key="revhistory" text="Revision historie"/>
-<gentext key="section" text="Afsnit"/>
-<gentext key="see" text="Se"/>
-<gentext key="seealso" text="Se ogs&#229;"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Skridt"/>
-<gentext key="tip" text="TIP"/>
-<gentext key="table" text="Tabel"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="ADVARSEL"/>
-<gentext key="warning" text="Advarsel"/>
-<gentext key="appendix" text="appendiks"/>
-<gentext key="chapter" text="kapitel"/>
-<gentext key="section" text="sektion"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="skridt"/>
-<gentext key="seealso" text="Se ogs&#229;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Indholdsfortegnelse"/>
-<gentext key="by" text="af"/>
-<gentext key="Edited" text="Redigeret"/>
-<gentext key="Editedby" text="Redigeret af"/>
-<gentext key="and" text="og"/>
-<gentext key="Notes" text="Slutbem&#230;rkning:"/>
-<gentext key="TableNotes" text="Noter:"/>
-<gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="Pgs" text="siderne"/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Abstract"/>
+ <gentext key="abstract" text="Abstract"/>
+ <gentext key="Answer" text="Svar"/>
+ <gentext key="answer" text="Svar"/>
+ <gentext key="Appendix" text="Appendiks"/>
+ <gentext key="Article" text="Artikel"/>
+ <gentext key="article" text="Artikel"/>
+ <gentext key="Bibliography" text="Bibliografi"/>
+ <gentext key="bibliography" text="Bibliografi"/>
+ <gentext key="Book" text="Bog"/>
+ <gentext key="book" text="Bog"/>
+ <gentext key="CAUTION" text="BEM&#198;RK"/>
+ <gentext key="caution" text="BEM&#198;RK"/>
+ <gentext key="Caution" text="Bem&#230;rk"/>
+ <gentext key="caution" text="Bem&#230;rk"/>
+ <gentext key="Chapter" text="Kapitel"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Tilegnet"/>
+ <gentext key="dedication" text="Tilegnet"/>
+ <gentext key="Edition" text="Udgave"/>
+ <gentext key="edition" text="Udgave"/>
+ <gentext key="Equation" text="Ligning"/>
+ <gentext key="equation" text="Ligning"/>
+ <gentext key="Example" text="Eksempel"/>
+ <gentext key="example" text="Eksempel"/>
+ <gentext key="Figure" text="Figur"/>
+ <gentext key="figure" text="Figur"/>
+ <gentext key="GlossSee" text="Se"/>
+ <gentext key="glosssee" text="Se"/>
+ <gentext key="GlossSeeAlso" text="Se ogs&#229;"/>
+ <gentext key="glossseealso" text="Se ogs&#229;"/>
+ <gentext key="Glossary" text="Stikordregister"/>
+ <gentext key="glossary" text="Stikordregister"/>
+ <gentext key="IMPORTANT" text="VIGTIGT"/>
+ <gentext key="important" text="VIGTIGT"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Vigtigt"/>
+ <gentext key="important" text="Vigtigt"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text="Retslig note"/>
+ <gentext key="legalnotice" text="Retslig note"/>
+ <gentext key="MsgAud" text="M&#229;lgruppe"/>
+ <gentext key="msgaud" text="M&#229;lgruppe"/>
+ <gentext key="MsgLevel" text="Niveau"/>
+ <gentext key="msglevel" text="Niveau"/>
+ <gentext key="MsgOrig" text="Grundlag"/>
+ <gentext key="msgorig" text="Grundlag"/>
+ <gentext key="NOTE" text="NOTE"/>
+ <gentext key="note" text="NOTE"/>
+ <gentext key="Note" text="Note"/>
+ <gentext key="note" text="Note"/>
+ <gentext key="Part" text="Del"/>
+ <gentext key="part" text="Del"/>
+ <gentext key="Preface" text="Forord"/>
+ <gentext key="preface" text="Forord"/>
+ <gentext key="Procedure" text="Procedure"/>
+ <gentext key="procedure" text="Procedure"/>
+ <gentext key="PubDate" text="Udgivet"/>
+ <gentext key="pubdate" text="Udgivet"/>
+ <gentext key="Published" text="Publiseret"/>
+ <gentext key="published" text="Publiseret"/>
+ <gentext key="Question" text="Sp&#248;rgsm&#229;l"/>
+ <gentext key="question" text="Sp&#248;rgsm&#229;l"/>
+ <gentext key="RefEntry" text="Enhed"/>
+ <gentext key="refentry" text="Enhed"/>
+ <gentext key="RefName" text="Navn"/>
+ <gentext key="refname" text="Navn"/>
+ <gentext key="Reference" text="Reference"/>
+ <gentext key="reference" text="Reference"/>
+ <gentext key="Revision" text="Revision"/>
+ <gentext key="revision" text="Revision"/>
+ <gentext key="RevHistory" text="Revision historie"/>
+ <gentext key="revhistory" text="Revision historie"/>
+ <gentext key="RefSection" text="Sektion"/>
+ <gentext key="refsection" text="Sektion"/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Section" text="Afsnit"/>
+ <gentext key="See" text="Se"/>
+ <gentext key="see" text="Se"/>
+ <gentext key="SeeAlso" text="Se ogs&#229;"/>
+ <gentext key="seealso" text="Se ogs&#229;"/>
+ <gentext key="Set" text="S&#230;t"/>
+ <gentext key="set" text="S&#230;t"/>
+ <gentext key="SetIndex" text="S&#230;t indeks"/>
+ <gentext key="setindex" text="S&#230;t indeks"/>
+ <gentext key="Sidebar" text="Side bar"/>
+ <gentext key="Step" text="Skridt"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="tip" text="TIP"/>
+ <gentext key="Table" text="Tabel"/>
+ <gentext key="table" text="Tabel"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="ADVARSEL"/>
+ <gentext key="warning" text="ADVARSEL"/>
+ <gentext key="Warning" text="Advarsel"/>
+ <gentext key="warning" text="Advarsel"/>
+ <gentext key="appendix" text="appendiks"/>
+ <gentext key="chapter" text="kapitel"/>
+ <gentext key="section" text="afsnit"/>
+ <gentext key="sidebar" text="side bar"/>
+ <gentext key="step" text="skridt"/>
+ <gentext key="Seealso" text="Se ogs&#229;"/>
+ <gentext key="seealso" text="Se ogs&#229;"/>
+ <gentext key="TableofContents" text="Indholdsfortegnelse"/>
+ <gentext key="tableofcontents" text="Indholdsfortegnelse"/>
+ <gentext key="in" text="i"/>
+ <gentext key="by" text="af"/>
+ <gentext key="Edited" text="Redigeret"/>
+ <gentext key="edited" text="Redigeret"/>
+ <gentext key="Editedby" text="Redigeret af"/>
+ <gentext key="editedby" text="Redigeret af"/>
+ <gentext key="and" text="og"/>
+ <gentext key="Notes" text="Slutbem&#230;rkning:"/>
+ <gentext key="notes" text="Slutbem&#230;rkning:"/>
+ <gentext key="TableNotes" text="Noter:"/>
+ <gentext key="tablenotes" text="Noter:"/>
+ <gentext key="nonexistantelement" text="ikke-eksisterende element"/>
+ <gentext key="Pgs" text="siderne"/>
+ <gentext key="pgs" text="siderne"/>
+ <gentext key="unsupported" text="ikke underst&#248;ttet"/>
+ <gentext key="xrefto" text="xref til"/>
+ <gentext key="unexpectedelementname" text="Uventet element navn"/>
+ <gentext key="Revisedby" text="Revideret af: "/>
+ <gentext key="revisedby" text="Revideret af: "/>
+ <gentext key="ListofTables" text="Liste over alle tabeller"/>
+ <gentext key="listoftables" text="Liste over alle tabeller"/>
+ <gentext key="ListofExamples" text="Liste over alle eksempler"/>
+ <gentext key="listofexamples" text="Liste over alle eksempler"/>
+ <gentext key="ListofFigures" text="Liste over alle figurer"/>
+ <gentext key="listoffigures" text="Liste over alle figurer"/>
+ <gentext key="ListofEquations" text="Liste over alle ligninger"/>
+ <gentext key="listofequations" text="Liste over alle ligninger"/>
+ <gentext key="ListofUnknown" text="Liste over alle ????"/>
+ <gentext key="listofunknown" text="Liste over alle ????"/>
+ <gentext key="nav-prev" text="Forrige"/>
+ <gentext key="nav-prev-sibling" text="Hurtigt tilbage"/>
+ <gentext key="nav-next-sibling" text="Hurtigt fremad"/>
+ <gentext key="nav-next" text="N&#230;ste"/>
+ <gentext key="nav-up" text="Op"/>
+ <gentext key="nav-home" text="Hjem"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Liste over alle tabeller"/>
-<gentext key="ListofExamples" text="Liste over alle eksempler"/>
-<gentext key="ListofFigures" text="Liste over alle figurer"/>
-<gentext key="ListofEquations" text="Liste over alle ligninger"/>
-<gentext key="ListofUnknown" text="Liste over alle ????"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Appendiks %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Ligning %n. %t"/>
+ <template name="example" text="Eksempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Forrige"/>
-<gentext key="nav-prev-sibling" text="Hurtigt tilbage"/>
-<gentext key="nav-next-sibling" text="Hurtigt fremad"/>
-<gentext key="nav-next" text="N&#230;ste"/>
-<gentext key="nav-up" text="Op"/>
-<gentext key="nav-home" text="Hjem"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Appendiks %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Eksempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Afsnit %n"/>
+ <template name="sect2" text="Afsnit %n"/>
+ <template name="sect3" text="Afsnit %n"/>
+ <template name="sect4" text="Afsnit %n"/>
+ <template name="sect5" text="Afsnit %n"/>
+ <template name="section" text="Afsnit %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" og "/>
+ <template name="seplast" text=", og "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Se "/>
+ <template name="seealso" text="Se ogs&#229; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Niveau: "/>
+ <template name="MsgOrig" text="Grundlag: "/>
+ <template name="MsgAud" text="M&#229;lgruppe: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/de.xml b/tests/docbook/common/de.xml
index 33d3e819..20fdaa02 100644
--- a/tests/docbook/common/de.xml
+++ b/tests/docbook/common/de.xml
@@ -1,99 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="de">
-<!--
- Contributions by: Michael Burschik, burschik@id-pro.de
--->
-<gentext key="abstract" text="Zusammenfassung"/>
-<gentext key="appendix" text="Anhang"/>
-<gentext key="article" text="Artikel"/>
-<gentext key="bibliography" text="Literaturverzeichnis"/>
-<gentext key="book" text="Buch"/>
-<gentext key="caution" text="Achtung"/>
-<gentext key="chapter" text="Kapitel"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Widmung"/>
-<gentext key="edition" text="Ausgabe"/>
-<gentext key="equation" text="Gleichung"/>
-<gentext key="example" text="Beispiel"/>
-<gentext key="figure" text="Abbildung"/>
-<gentext key="glosssee" text="Siehe"/>
-<gentext key="glossseealso" text="Siehe auch"/>
-<gentext key="glossary" text="Glossar"/>
-<gentext key="important" text="WICHTIG"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Wichtig"/>
-<gentext key="index" text="Stichwortverzeichnis"/>
-<gentext key="legalnotice" text="Rechtlicher Hinweis"/>
-<gentext key="msgaud" text="Zielgruppe"/>
-<gentext key="msglevel" text="Dringlichkeit"/>
-<gentext key="msgorig" text="Ursprung"/>
-<gentext key="note" text="Anmerkung"/>
-<gentext key="part" text="Teil"/>
-<gentext key="preface" text="Vorwort"/>
-<gentext key="procedure" text="Prozedur"/>
-<gentext key="published" text="Ver&#x00F6;ffentlicht"/>
-<gentext key="refname" text="Name"/>
-<gentext key="reference" text="Verweis"/>
-<gentext key="refsection" text="Abschnitt"/>
-<gentext key="refsynopsisdiv" text="Synopsis"/> <!--en-->
-<gentext key="revhistory" text="Versionsgeschichte"/>
-<gentext key="revision" text="Version"/>
-<gentext key="section" text="Abschnitt"/>
-<gentext key="see" text="Siehe"/>
-<gentext key="seealso" text="Siehe auch"/>
-<gentext key="seealso" text="Siehe auch"/>
-<gentext key="set" text="Satz"/>
-<gentext key="setindex" text="Stichwortverzeichnis"/>
-<gentext key="sidebar" text="Randnotiz"/>
-<gentext key="step" text="Schritt"/>
-<gentext key="tip" text="TIP"/>
-<gentext key="table" text="Tabelle"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="WARNUNG"/>
-<gentext key="appendix" text="Anhang"/>
-<gentext key="chapter" text="Kapitel"/>
-<gentext key="section" text="Abschnitt"/>
-<gentext key="step" text="Schritt"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Inhaltsverzeichnis"/>
-<gentext key="in" text="in"/>
-<gentext key="by" text="von"/>
-<gentext key="Edited" text="Herausgegeben"/>
-<gentext key="Editedby" text="Herausgegeben von"/>
-<gentext key="and" text="und"/>
-<gentext key="Notes" text="Fu&#x00DF;noten"/>
-<gentext key="TableNotes" text="Bemerkungen"/>
-<gentext key="nonexistantelement" text="nicht existierendes Element"/>
-<gentext key="Pgs" text="Seiten"/>
-<gentext key="unsupported" text="wird nicht unterst&#x00FC;tzt"/>
-<gentext key="xrefto" text="xref auf"/>
-<gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
-<gentext key="Revisedby" text="Ge&#x00E4;ndert durch: "/>
+ <gentext key="Abstract" text="Zusammenfassung"/>
+ <gentext key="abstract" text="Zusammenfassung"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Anhang"/>
+ <gentext key="Article" text="Artikel"/>
+ <gentext key="article" text="Artikel"/>
+ <gentext key="Bibliography" text="Literaturverzeichnis"/>
+ <gentext key="bibliography" text="Literaturverzeichnis"/>
+ <gentext key="Book" text="Buch"/>
+ <gentext key="book" text="Buch"/>
+ <gentext key="CAUTION" text="ACHTUNG"/>
+ <gentext key="caution" text="ACHTUNG"/>
+ <gentext key="Caution" text="Achtung"/>
+ <gentext key="caution" text="Achtung"/>
+ <gentext key="Chapter" text="Kapitel"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Widmung"/>
+ <gentext key="dedication" text="Widmung"/>
+ <gentext key="Edition" text="Ausgabe"/>
+ <gentext key="edition" text="Ausgabe"/>
+ <gentext key="Equation" text="Gleichung"/>
+ <gentext key="equation" text="Gleichung"/>
+ <gentext key="Example" text="Beispiel"/>
+ <gentext key="example" text="Beispiel"/>
+ <gentext key="Figure" text="Abbildung"/>
+ <gentext key="figure" text="Abbildung"/>
+ <gentext key="GlossSee" text="Siehe"/>
+ <gentext key="glosssee" text="Siehe"/>
+ <gentext key="GlossSeeAlso" text="Siehe auch"/>
+ <gentext key="glossseealso" text="Siehe auch"/>
+ <gentext key="Glossary" text="Glossar"/>
+ <gentext key="glossary" text="Glossar"/>
+ <gentext key="IMPORTANT" text="WICHTIG"/>
+ <gentext key="important" text="WICHTIG"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Wichtig"/>
+ <gentext key="important" text="Wichtig"/>
+ <gentext key="Index" text="Stichwortverzeichnis"/>
+ <gentext key="index" text="Stichwortverzeichnis"/>
+ <gentext key="LegalNotice" text="Rechtlicher Hinweis"/>
+ <gentext key="legalnotice" text="Rechtlicher Hinweis"/>
+ <gentext key="MsgAud" text="Zielgruppe"/>
+ <gentext key="msgaud" text="Zielgruppe"/>
+ <gentext key="MsgLevel" text="Dringlichkeit"/>
+ <gentext key="msglevel" text="Dringlichkeit"/>
+ <gentext key="MsgOrig" text="Ursprung"/>
+ <gentext key="msgorig" text="Ursprung"/>
+ <gentext key="NOTE" text="ANMERKUNG"/>
+ <gentext key="note" text="ANMERKUNG"/>
+ <gentext key="Note" text="Anmerkung"/>
+ <gentext key="note" text="Anmerkung"/>
+ <gentext key="Part" text="Teil"/>
+ <gentext key="part" text="Teil"/>
+ <gentext key="Preface" text="Vorwort"/>
+ <gentext key="preface" text="Vorwort"/>
+ <gentext key="Procedure" text="Prozedur"/>
+ <gentext key="procedure" text="Prozedur"/>
+ <gentext key="Published" text="Ver&#246;ffentlicht"/>
+ <gentext key="published" text="Ver&#246;ffentlicht"/>
+ <gentext key="Question" text="F:"/>
+ <gentext key="question" text="F:"/>
+ <gentext key="RefName" text="Name"/>
+ <gentext key="refname" text="Name"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Verweis"/>
+ <gentext key="reference" text="Verweis"/>
+ <gentext key="RefSection" text="Abschnitt"/>
+ <gentext key="refsection" text="Abschnitt"/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="RevHistory" text="Versionsgeschichte"/>
+ <gentext key="revhistory" text="Versionsgeschichte"/>
+ <gentext key="Revision" text="Version"/>
+ <gentext key="revision" text="Version"/>
+ <gentext key="Section" text="Abschnitt"/>
+ <gentext key="See" text="Siehe"/>
+ <gentext key="see" text="Siehe"/>
+ <gentext key="SeeAlso" text="Siehe auch"/>
+ <gentext key="seealso" text="Siehe auch"/>
+ <gentext key="Seealso" text="Siehe auch"/>
+ <gentext key="seealso" text="Siehe auch"/>
+ <gentext key="Set" text="Satz"/>
+ <gentext key="set" text="Satz"/>
+ <gentext key="SetIndex" text="Stichwortverzeichnis"/>
+ <gentext key="setindex" text="Stichwortverzeichnis"/>
+ <gentext key="Sidebar" text="Randnotiz"/>
+ <gentext key="sidebar" text="randnotiz"/>
+ <gentext key="Step" text="Schritt"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="tip" text="TIP"/>
+ <gentext key="Table" text="Tabelle"/>
+ <gentext key="table" text="Tabelle"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="WARNUNG"/>
+ <gentext key="warning" text="WARNUNG"/>
+ <gentext key="Warning" text="Warnung"/>
+ <gentext key="warning" text="Warnung"/>
+ <gentext key="appendix" text="Anhang"/>
+ <gentext key="chapter" text="Kapitel"/>
+ <gentext key="section" text="Abschnitt"/>
+ <gentext key="step" text="Schritt"/>
+ <gentext key="TableofContents" text="Inhaltsverzeichnis"/>
+ <gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
+ <gentext key="in" text="in"/>
+ <gentext key="by" text="von"/>
+ <gentext key="Edited" text="Herausgegeben"/>
+ <gentext key="edited" text="Herausgegeben"/>
+ <gentext key="Editedby" text="Herausgegeben von"/>
+ <gentext key="editedby" text="Herausgegeben von"/>
+ <gentext key="and" text="und"/>
+ <gentext key="Notes" text="Fu&#223;noten"/>
+ <gentext key="notes" text="Fu&#223;noten"/>
+ <gentext key="TableNotes" text="Bemerkungen"/>
+ <gentext key="tablenotes" text="Bemerkungen"/>
+ <gentext key="nonexistantelement" text="nicht existierendes Element"/>
+ <gentext key="Pgs" text="Seiten"/>
+ <gentext key="pgs" text="Seiten"/>
+ <gentext key="unsupported" text="wird nicht unterst&#252;tzt"/>
+ <gentext key="xrefto" text="xref auf"/>
+ <gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
+ <gentext key="Revisedby" text="Ge&#228;ndert durch: "/>
+ <gentext key="revisedby" text="Ge&#228;ndert durch: "/>
+ <gentext key="ListofTables" text="Tabellenverzeichnis"/>
+ <gentext key="listoftables" text="Tabellenverzeichnis"/>
+ <gentext key="ListofExamples" text="Beispiele"/>
+ <gentext key="listofexamples" text="Beispiele"/>
+ <gentext key="ListofFigures" text="Abbildungsverzeichnis"/>
+ <gentext key="listoffigures" text="Abbildungsverzeichnis"/>
+ <gentext key="ListofEquations" text="Gleichungen"/>
+ <gentext key="listofequations" text="Gleichungen"/>
+ <gentext key="ListofUnknown" text="???-Verzeichnis"/>
+ <gentext key="listofunknown" text="???-Verzeichnis"/>
+ <gentext key="nav-prev" text="Zur&#252;ck"/>
+ <gentext key="nav-prev-sibling" text="Schnell zur&#252;ck"/>
+ <gentext key="nav-next-sibling" text="Schnell vor"/>
+ <gentext key="nav-next" text="Vor"/>
+ <gentext key="nav-up" text="Hoch"/>
+ <gentext key="nav-home" text="Anfang"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Tabellenverzeichnis"/>
-<gentext key="ListofExamples" text="Beispiele"/>
-<gentext key="ListofFigures" text="Abbildungsverzeichnis"/>
-<gentext key="ListofEquations" text="Gleichungen"/>
-<gentext key="ListofUnknown" text="???-Verzeichnis"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Anhang %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Gleichung %n. %t"/>
+ <template name="example" text="Beispiel %n. %t"/>
+ <template name="figure" text="Abbildung %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Teil %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabelle %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Zur&#x00FC;ck"/>
-<gentext key="nav-prev-sibling" text="Schnell zur&#x00FC;ck"/>
-<gentext key="nav-next-sibling" text="Schnell vor"/>
-<gentext key="nav-next" text="Vor"/>
-<gentext key="nav-up" text="Hoch"/>
-<gentext key="nav-home" text="Anfang"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Anhang %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Beispiel %n. %t"/>
+ <template name="figure" text="Abbildung %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Teil %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabelle %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Abschnitt %n"/>
+ <template name="sect2" text="Abschnitt %n"/>
+ <template name="sect3" text="Abschnitt %n"/>
+ <template name="sect4" text="Abschnitt %n"/>
+ <template name="sect5" text="Abschnitt %n"/>
+ <template name="section" text="Abschnitt %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" und "/>
+ <template name="seplast" text=" und "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Siehe "/>
+ <template name="seealso" text="Siehe auch "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Dringlichkeit: "/>
+ <template name="MsgOrig" text="Ursprung: "/>
+ <template name="MsgAud" text="Zielgruppe: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/el.xml b/tests/docbook/common/el.xml
index ad930320..e8e6bc83 100644
--- a/tests/docbook/common/el.xml
+++ b/tests/docbook/common/el.xml
@@ -1,104 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="el">
-<gentext key="abstract" text="&#208;&#229;&#241;&#223;&#235;&#231;&#248;&#231;"/>
-<gentext key="answer" text="&#193;:"/>
-<gentext key="appendix" text="&#208;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
-<gentext key="article" text="&#182;&#241;&#232;&#241;&#239;"/>
-<gentext key="bibliography" text="&#194;&#233;&#226;&#235;&#233;&#239;&#227;&#241;&#225;&#246;&#223;&#225;"/>
-<gentext key="book" text="&#194;&#233;&#226;&#235;&#223;&#239;"/>
-<gentext key="caution" text="&#208;&#209;&#207;&#211;&#207;&#215;&#199;"/>
-<gentext key="caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
-<gentext key="chapter" text="&#202;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
-<gentext key="colophon" text="&#202;&#239;&#241;&#249;&#237;&#223;&#228;&#225;"/>
-<gentext key="copyright" text="&#208;&#237;&#229;&#245;&#236;&#225;&#244;&#233;&#234;&#220; &#196;&#233;&#234;&#225;&#233;&#254;&#236;&#225;&#244;&#225;"/>
-<gentext key="dedication" text="&#193;&#246;&#233;&#221;&#241;&#249;&#243;&#231;"/>
-<gentext key="edition" text="&#184;&#234;&#228;&#239;&#243;&#231;"/>
-<gentext key="equation" text="&#197;&#238;&#223;&#243;&#249;&#243;&#231;"/>
-<gentext key="example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225;"/>
-<gentext key="figure" text="&#211;&#247;&#222;&#236;&#225;"/>
-<gentext key="glosssee" text="&#196;&#229;&#223;&#244;&#229;"/>
-<gentext key="glossseealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
-<gentext key="glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
-<gentext key="important" text="&#211;&#199;&#204;&#193;&#205;&#212;&#201;&#202;&#207;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="&#211;&#231;&#236;&#225;&#237;&#244;&#233;&#234;&#252;"/>
-<gentext key="index" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239;"/>
-<gentext key="legalnotice" text="&#205;&#239;&#236;&#233;&#234;&#222; &#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
-<gentext key="msgaud" text="&#193;&#234;&#241;&#239;&#225;&#244;&#222;&#241;&#233;&#239;"/>
-<gentext key="msglevel" text="&#197;&#240;&#223;&#240;&#229;&#228;&#239;"/>
-<gentext key="msgorig" text="&#208;&#231;&#227;&#222;"/>
-<gentext key="note" text="&#211;&#199;&#204;&#197;&#201;&#217;&#211;&#199;"/>
-<gentext key="note" text="&#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
-<gentext key="part" text="&#204;&#221;&#241;&#239;&#242;"/>
-<gentext key="preface" text="&#197;&#233;&#243;&#225;&#227;&#249;&#227;&#222;"/>
-<gentext key="procedure" text="&#196;&#233;&#225;&#228;&#233;&#234;&#225;&#243;&#223;&#225;"/>
-<gentext key="published" text="&#196;&#231;&#236;&#239;&#243;&#233;&#229;&#245;&#236;&#221;&#237;&#239;"/>
-<gentext key="question" text="&#197;:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="&#193;&#237;&#225;&#246;&#239;&#241;&#220;"/>
-<gentext key="refname" text="&#188;&#237;&#239;&#236;&#225;"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="&#211;&#253;&#237;&#239;&#248;&#231;"/>
-<gentext key="revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
-<gentext key="revhistory" text="&#201;&#243;&#244;&#239;&#241;&#233;&#234;&#252; &#193;&#237;&#225;&#232;&#229;&#249;&#241;&#222;&#243;&#229;&#249;&#237;"/>
-<gentext key="section" text="&#212;&#236;&#222;&#236;&#225;"/>
-<gentext key="see" text="&#196;&#229;&#223;&#244;&#229;"/>
-<gentext key="seealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
-<gentext key="set" text="&#211;&#253;&#237;&#239;&#235;&#239;"/>
-<gentext key="setindex" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239; &#211;&#245;&#237;&#252;&#235;&#249;&#237;"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="&#214;&#220;&#243;&#231;"/>
-<gentext key="tip" text="&#213;&#208;&#207;&#196;&#197;&#201;&#206;&#199;"/>
-<gentext key="table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242;"/>
-<gentext key="tip" text="&#213;&#240;&#252;&#228;&#229;&#233;&#238;&#231;"/>
-<gentext key="warning" text="&#208;&#209;&#207;&#197;&#201;&#196;&#207;&#208;&#207;&#201;&#199;&#211;&#199;"/>
-<gentext key="warning" text="&#208;&#241;&#239;&#229;&#233;&#228;&#239;&#240;&#239;&#223;&#231;&#243;&#231;"/>
-<gentext key="appendix" text="&#240;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
-<gentext key="chapter" text="&#234;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
-<gentext key="section" text="&#244;&#236;&#222;&#236;&#225;"/>
-<gentext key="sidebar" text="&#229;&#240;&#229;&#238;&#231;&#227;&#231;&#236;&#225;&#244;&#233;&#234;&#252; &#240;&#235;&#229;&#245;&#241;&#233;&#234;&#252; &#225;&#241;&#232;&#241;&#223;&#228;&#233;&#239;"/>
-<gentext key="step" text="&#246;&#220;&#243;&#231;"/>
-<gentext key="seealso" text="&#196;&#229;&#223;&#244;&#229; &#229;&#240;&#223;&#243;&#231;&#242;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
-<gentext key="in" text="&#243;&#229;"/>
-<gentext key="by" text="&#225;&#240;&#252;"/>
-<gentext key="Edited" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225;"/>
-<gentext key="Editedby" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225; &#225;&#240;&#252;"/>
-<gentext key="and" text="&#234;&#225;&#233;"/>
-<gentext key="Notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
-<gentext key="TableNotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
-<gentext key="nonexistantelement" text="&#236;&#231;-&#245;&#240;&#225;&#241;&#234;&#244;&#252; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;"/>
-<gentext key="Pgs" text="&#211;&#235;&#228;&#242;."/>
-<gentext key="unsupported" text="&#236;&#231; &#245;&#240;&#239;&#243;&#244;&#231;&#241;&#233;&#230;&#252;&#236;&#229;&#237;&#239;"/>
-<gentext key="xrefto" text="&#225;&#237;&#244;&#233;&#240;&#225;&#241;&#225;&#240;&#239;&#236;&#240;&#222; &#243;&#229;"/>
-<gentext key="unexpectedelementname" text="&#204;&#231; &#225;&#237;&#225;&#236;&#229;&#237;&#252;&#236;&#229;&#237;&#239; &#252;&#237;&#239;&#236;&#225; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;&#245;"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="&#208;&#229;&#241;&#223;&#235;&#231;&#248;&#231;"/>
+ <gentext key="abstract" text="&#208;&#229;&#241;&#223;&#235;&#231;&#248;&#231;"/>
+ <gentext key="Answer" text="&#193;:"/>
+ <gentext key="answer" text="&#193;:"/>
+ <gentext key="Appendix" text="&#208;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
+ <gentext key="Article" text="&#182;&#241;&#232;&#241;&#239;"/>
+ <gentext key="article" text="&#182;&#241;&#232;&#241;&#239;"/>
+ <gentext key="Bibliography" text="&#194;&#233;&#226;&#235;&#233;&#239;&#227;&#241;&#225;&#246;&#223;&#225;"/>
+ <gentext key="bibliography" text="&#194;&#233;&#226;&#235;&#233;&#239;&#227;&#241;&#225;&#246;&#223;&#225;"/>
+ <gentext key="Book" text="&#194;&#233;&#226;&#235;&#223;&#239;"/>
+ <gentext key="book" text="&#194;&#233;&#226;&#235;&#223;&#239;"/>
+ <gentext key="CAUTION" text="&#208;&#209;&#207;&#211;&#207;&#215;&#199;"/>
+ <gentext key="caution" text="&#208;&#209;&#207;&#211;&#207;&#215;&#199;"/>
+ <gentext key="Caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
+ <gentext key="caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
+ <gentext key="Chapter" text="&#202;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
+ <gentext key="Colophon" text="&#202;&#239;&#241;&#249;&#237;&#223;&#228;&#225;"/>
+ <gentext key="colophon" text="&#202;&#239;&#241;&#249;&#237;&#223;&#228;&#225;"/>
+ <gentext key="Copyright" text="&#208;&#237;&#229;&#245;&#236;&#225;&#244;&#233;&#234;&#220; &#196;&#233;&#234;&#225;&#233;&#254;&#236;&#225;&#244;&#225;"/>
+ <gentext key="copyright" text="&#208;&#237;&#229;&#245;&#236;&#225;&#244;&#233;&#234;&#220; &#196;&#233;&#234;&#225;&#233;&#254;&#236;&#225;&#244;&#225;"/>
+ <gentext key="Dedication" text="&#193;&#246;&#233;&#221;&#241;&#249;&#243;&#231;"/>
+ <gentext key="dedication" text="&#193;&#246;&#233;&#221;&#241;&#249;&#243;&#231;"/>
+ <gentext key="Edition" text="&#184;&#234;&#228;&#239;&#243;&#231;"/>
+ <gentext key="edition" text="&#184;&#234;&#228;&#239;&#243;&#231;"/>
+ <gentext key="Equation" text="&#197;&#238;&#223;&#243;&#249;&#243;&#231;"/>
+ <gentext key="equation" text="&#197;&#238;&#223;&#243;&#249;&#243;&#231;"/>
+ <gentext key="Example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225;"/>
+ <gentext key="example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225;"/>
+ <gentext key="Figure" text="&#211;&#247;&#222;&#236;&#225;"/>
+ <gentext key="figure" text="&#211;&#247;&#222;&#236;&#225;"/>
+ <gentext key="GlossSee" text="&#196;&#229;&#223;&#244;&#229;"/>
+ <gentext key="glosssee" text="&#196;&#229;&#223;&#244;&#229;"/>
+ <gentext key="GlossSeeAlso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="glossseealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="Glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
+ <gentext key="glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
+ <gentext key="IMPORTANT" text="&#211;&#199;&#204;&#193;&#205;&#212;&#201;&#202;&#207;"/>
+ <gentext key="important" text="&#211;&#199;&#204;&#193;&#205;&#212;&#201;&#202;&#207;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="&#211;&#231;&#236;&#225;&#237;&#244;&#233;&#234;&#252;"/>
+ <gentext key="important" text="&#211;&#231;&#236;&#225;&#237;&#244;&#233;&#234;&#252;"/>
+ <gentext key="Index" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239;"/>
+ <gentext key="index" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239;"/>
+ <gentext key="LegalNotice" text="&#205;&#239;&#236;&#233;&#234;&#222; &#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
+ <gentext key="legalnotice" text="&#205;&#239;&#236;&#233;&#234;&#222; &#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
+ <gentext key="MsgAud" text="&#193;&#234;&#241;&#239;&#225;&#244;&#222;&#241;&#233;&#239;"/>
+ <gentext key="msgaud" text="&#193;&#234;&#241;&#239;&#225;&#244;&#222;&#241;&#233;&#239;"/>
+ <gentext key="MsgLevel" text="&#197;&#240;&#223;&#240;&#229;&#228;&#239;"/>
+ <gentext key="msglevel" text="&#197;&#240;&#223;&#240;&#229;&#228;&#239;"/>
+ <gentext key="MsgOrig" text="&#208;&#231;&#227;&#222;"/>
+ <gentext key="msgorig" text="&#208;&#231;&#227;&#222;"/>
+ <gentext key="NOTE" text="&#211;&#199;&#204;&#197;&#201;&#217;&#211;&#199;"/>
+ <gentext key="note" text="&#211;&#199;&#204;&#197;&#201;&#217;&#211;&#199;"/>
+ <gentext key="Note" text="&#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
+ <gentext key="note" text="&#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
+ <gentext key="Part" text="&#204;&#221;&#241;&#239;&#242;"/>
+ <gentext key="part" text="&#204;&#221;&#241;&#239;&#242;"/>
+ <gentext key="Preface" text="&#197;&#233;&#243;&#225;&#227;&#249;&#227;&#222;"/>
+ <gentext key="preface" text="&#197;&#233;&#243;&#225;&#227;&#249;&#227;&#222;"/>
+ <gentext key="Procedure" text="&#196;&#233;&#225;&#228;&#233;&#234;&#225;&#243;&#223;&#225;"/>
+ <gentext key="procedure" text="&#196;&#233;&#225;&#228;&#233;&#234;&#225;&#243;&#223;&#225;"/>
+ <gentext key="Published" text="&#196;&#231;&#236;&#239;&#243;&#233;&#229;&#245;&#236;&#221;&#237;&#239;"/>
+ <gentext key="published" text="&#196;&#231;&#236;&#239;&#243;&#233;&#229;&#245;&#236;&#221;&#237;&#239;"/>
+ <gentext key="Question" text="&#197;:"/>
+ <gentext key="question" text="&#197;:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="&#193;&#237;&#225;&#246;&#239;&#241;&#220;"/>
+ <gentext key="reference" text="&#193;&#237;&#225;&#246;&#239;&#241;&#220;"/>
+ <gentext key="RefName" text="&#188;&#237;&#239;&#236;&#225;"/>
+ <gentext key="refname" text="&#188;&#237;&#239;&#236;&#225;"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="&#211;&#253;&#237;&#239;&#248;&#231;"/>
+ <gentext key="refsynopsisdiv" text="&#211;&#253;&#237;&#239;&#248;&#231;"/>
+ <gentext key="Revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
+ <gentext key="revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
+ <gentext key="RevHistory" text="&#201;&#243;&#244;&#239;&#241;&#233;&#234;&#252; &#193;&#237;&#225;&#232;&#229;&#249;&#241;&#222;&#243;&#229;&#249;&#237;"/>
+ <gentext key="revhistory" text="&#201;&#243;&#244;&#239;&#241;&#233;&#234;&#252; &#193;&#237;&#225;&#232;&#229;&#249;&#241;&#222;&#243;&#229;&#249;&#237;"/>
+ <gentext key="Section" text="&#212;&#236;&#222;&#236;&#225;"/>
+ <gentext key="See" text="&#196;&#229;&#223;&#244;&#229;"/>
+ <gentext key="see" text="&#196;&#229;&#223;&#244;&#229;"/>
+ <gentext key="SeeAlso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="seealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="Set" text="&#211;&#253;&#237;&#239;&#235;&#239;"/>
+ <gentext key="set" text="&#211;&#253;&#237;&#239;&#235;&#239;"/>
+ <gentext key="SetIndex" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239; &#211;&#245;&#237;&#252;&#235;&#249;&#237;"/>
+ <gentext key="setindex" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239; &#211;&#245;&#237;&#252;&#235;&#249;&#237;"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="&#214;&#220;&#243;&#231;"/>
+ <gentext key="TIP" text="&#213;&#208;&#207;&#196;&#197;&#201;&#206;&#199;"/>
+ <gentext key="tip" text="&#213;&#208;&#207;&#196;&#197;&#201;&#206;&#199;"/>
+ <gentext key="Table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242;"/>
+ <gentext key="table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242;"/>
+ <gentext key="Tip" text="&#213;&#240;&#252;&#228;&#229;&#233;&#238;&#231;"/>
+ <gentext key="tip" text="&#213;&#240;&#252;&#228;&#229;&#233;&#238;&#231;"/>
+ <gentext key="WARNING" text="&#208;&#209;&#207;&#197;&#201;&#196;&#207;&#208;&#207;&#201;&#199;&#211;&#199;"/>
+ <gentext key="warning" text="&#208;&#209;&#207;&#197;&#201;&#196;&#207;&#208;&#207;&#201;&#199;&#211;&#199;"/>
+ <gentext key="Warning" text="&#208;&#241;&#239;&#229;&#233;&#228;&#239;&#240;&#239;&#223;&#231;&#243;&#231;"/>
+ <gentext key="warning" text="&#208;&#241;&#239;&#229;&#233;&#228;&#239;&#240;&#239;&#223;&#231;&#243;&#231;"/>
+ <gentext key="appendix" text="&#240;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
+ <gentext key="chapter" text="&#234;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
+ <gentext key="section" text="&#244;&#236;&#222;&#236;&#225;"/>
+ <gentext key="sidebar" text="&#229;&#240;&#229;&#238;&#231;&#227;&#231;&#236;&#225;&#244;&#233;&#234;&#252; &#240;&#235;&#229;&#245;&#241;&#233;&#234;&#252; &#225;&#241;&#232;&#241;&#223;&#228;&#233;&#239;"/>
+ <gentext key="step" text="&#246;&#220;&#243;&#231;"/>
+ <gentext key="Seealso" text="&#196;&#229;&#223;&#244;&#229; &#229;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="seealso" text="&#196;&#229;&#223;&#244;&#229; &#229;&#240;&#223;&#243;&#231;&#242;"/>
+ <gentext key="TableofContents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
+ <gentext key="tableofcontents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
+ <gentext key="in" text="&#243;&#229;"/>
+ <gentext key="by" text="&#225;&#240;&#252;"/>
+ <gentext key="Edited" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225;"/>
+ <gentext key="edited" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225;"/>
+ <gentext key="Editedby" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225; &#225;&#240;&#252;"/>
+ <gentext key="editedby" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225; &#225;&#240;&#252;"/>
+ <gentext key="and" text="&#234;&#225;&#233;"/>
+ <gentext key="Notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
+ <gentext key="notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
+ <gentext key="TableNotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
+ <gentext key="tablenotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
+ <gentext key="nonexistantelement" text="&#236;&#231;-&#245;&#240;&#225;&#241;&#234;&#244;&#252; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;"/>
+ <gentext key="Pgs" text="&#211;&#235;&#228;&#242;."/>
+ <gentext key="pgs" text="&#211;&#235;&#228;&#242;."/>
+ <gentext key="unsupported" text="&#236;&#231; &#245;&#240;&#239;&#243;&#244;&#231;&#241;&#233;&#230;&#252;&#236;&#229;&#237;&#239;"/>
+ <gentext key="xrefto" text="&#225;&#237;&#244;&#233;&#240;&#225;&#241;&#225;&#240;&#239;&#236;&#240;&#222; &#243;&#229;"/>
+ <gentext key="unexpectedelementname" text="&#204;&#231; &#225;&#237;&#225;&#236;&#229;&#237;&#252;&#236;&#229;&#237;&#239; &#252;&#237;&#239;&#236;&#225; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;&#245;"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
+ <gentext key="listoftables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
+ <gentext key="ListofExamples" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#225;&#241;&#225;&#228;&#229;&#233;&#227;&#236;&#220;&#244;&#249;&#237;"/>
+ <gentext key="listofexamples" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#225;&#241;&#225;&#228;&#229;&#233;&#227;&#236;&#220;&#244;&#249;&#237;"/>
+ <gentext key="ListofFigures" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#211;&#247;&#231;&#236;&#220;&#244;&#249;&#237;"/>
+ <gentext key="listoffigures" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#211;&#247;&#231;&#236;&#220;&#244;&#249;&#237;"/>
+ <gentext key="ListofEquations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
+ <gentext key="listofequations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
+ <gentext key="ListofUnknown" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#193;&#227;&#237;&#254;&#243;&#244;&#249;&#237;"/>
+ <gentext key="listofunknown" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#193;&#227;&#237;&#254;&#243;&#244;&#249;&#237;"/>
+ <gentext key="nav-prev" text="&#208;&#241;&#239;&#231;&#227;"/>
+ <gentext key="nav-prev-sibling" text="&#208;&#241;&#239;&#242; &#244;&#231;&#237; &#225;&#241;&#247;&#222;"/>
+ <gentext key="nav-next-sibling" text="&#208;&#241;&#239;&#242; &#244;&#239; &#244;&#221;&#235;&#239;&#242;"/>
+ <gentext key="nav-next" text="&#197;&#240;&#252;&#236;&#229;&#237;&#239;"/>
+ <gentext key="nav-up" text="&#208;&#220;&#237;&#249;"/>
+ <gentext key="nav-home" text="&#193;&#241;&#247;&#222;"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
-<gentext key="ListofExamples" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#225;&#241;&#225;&#228;&#229;&#233;&#227;&#236;&#220;&#244;&#249;&#237;"/>
-<gentext key="ListofFigures" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#211;&#247;&#231;&#236;&#220;&#244;&#249;&#237;"/>
-<gentext key="ListofEquations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
-<gentext key="ListofUnknown" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#193;&#227;&#237;&#254;&#243;&#244;&#249;&#237;"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#208;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="&#202;&#229;&#246;&#220;&#235;&#225;&#233;&#239; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#197;&#238;&#223;&#243;&#249;&#243;&#231; %n. %t"/>
+ <template name="example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225; %n. %t"/>
+ <template name="figure" text="&#211;&#247;&#222;&#236;&#225; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#204;&#221;&#241;&#239;&#242; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="&#208;&#241;&#239;&#231;&#227;"/>
-<gentext key="nav-prev-sibling" text="&#208;&#241;&#239;&#242; &#244;&#231;&#237; &#225;&#241;&#247;&#222;"/>
-<gentext key="nav-next-sibling" text="&#208;&#241;&#239;&#242; &#244;&#239; &#244;&#221;&#235;&#239;&#242;"/>
-<gentext key="nav-next" text="&#197;&#240;&#252;&#236;&#229;&#237;&#239;"/>
-<gentext key="nav-up" text="&#208;&#220;&#237;&#249;"/>
-<gentext key="nav-home" text="&#193;&#241;&#247;&#222;"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="&#208;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="&#202;&#229;&#246;&#220;&#235;&#225;&#233;&#239; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225; %n. %t"/>
+ <template name="figure" text="&#211;&#247;&#222;&#236;&#225; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#204;&#221;&#241;&#239;&#242; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="sect2" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="sect3" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="sect4" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="sect5" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="section" text="&#212;&#236;&#222;&#236;&#225; %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#234;&#225;&#233; "/>
+ <template name="seplast" text=", &#234;&#225;&#233; "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="&#196;&#229;&#223;&#244;&#229; "/>
+ <template name="seealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#197;&#240;&#223;&#240;&#229;&#228;&#239;: "/>
+ <template name="MsgOrig" text="&#208;&#231;&#227;&#222;: "/>
+ <template name="MsgAud" text="&#193;&#234;&#241;&#239;&#225;&#244;&#222;&#241;&#233;&#239;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/en.xml b/tests/docbook/common/en.xml
index a105370b..ebf70531 100644
--- a/tests/docbook/common/en.xml
+++ b/tests/docbook/common/en.xml
@@ -1,102 +1,340 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="en">
-<gentext key="abstract" text="Abstract"/>
-<gentext key="answer" text="A:"/>
-<gentext key="appendix" text="Appendix"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliography"/>
-<gentext key="book" text="Book"/>
-<gentext key="caution" text="Caution"/>
-<gentext key="chapter" text="Chapter"/>
-<gentext key="colophon" text="Colophon"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedication"/>
-<gentext key="edition" text="Edition"/>
-<gentext key="equation" text="Equation"/>
-<gentext key="example" text="Example"/>
-<gentext key="figure" text="Figure"/>
-<gentext key="glossary" text="Glossary"/>
-<gentext key="glosssee" text="See"/>
-<gentext key="glossseealso" text="See Also"/>
-<gentext key="important" text="Important"/>
-<gentext key="index" text="Index"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="legalnotice" text="Legal Notice"/>
-<gentext key="msgaud" text="Audience"/>
-<gentext key="msglevel" text="Level"/>
-<gentext key="msgorig" text="Origin"/>
-<gentext key="note" text="Note"/>
-<gentext key="part" text="Part"/>
-<gentext key="preface" text="Preface"/>
-<gentext key="procedure" text="Procedure"/>
-<gentext key="published" text="Published"/>
-<gentext key="question" text="Q:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Reference"/>
-<gentext key="refname" text="Name"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="Synopsis"/>
-<gentext key="revhistory" text="Revision History"/>
-<gentext key="revision" text="Revision"/>
-<gentext key="section" text="Section"/>
-<gentext key="sect1" text="Section"/>
-<gentext key="sect2" text="Section"/>
-<gentext key="sect3" text="Section"/>
-<gentext key="sect4" text="Section"/>
-<gentext key="sect5" text="Section"/>
-<gentext key="see" text="See"/>
-<gentext key="seealso" text="See Also"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text="Sidebar"/>
-<gentext key="step" text="Step"/>
-<gentext key="table" text="Table"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="Warning"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Table of Contents"/>
-<gentext key="in" text="in"/>
-<gentext key="by" text="by"/>
-<gentext key="Edited" text="Edited"/>
-<gentext key="Editedby" text="Edited by"/>
-<gentext key="and" text="and"/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="Pgs" text="Pgs."/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Revised by:"/>
+ <gentext key="Abstract" text="Abstract"/>
+ <gentext key="abstract" text="Abstract"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Appendix"/>
+ <gentext key="Article" text="Article"/>
+ <gentext key="article" text="Article"/>
+ <gentext key="Bibliography" text="Bibliography"/>
+ <gentext key="bibliography" text="Bibliography"/>
+ <gentext key="Book" text="Book"/>
+ <gentext key="book" text="Book"/>
+ <gentext key="CAUTION" text="CAUTION"/>
+ <gentext key="Caution" text="Caution"/>
+ <gentext key="caution" text="Caution"/>
+ <gentext key="Chapter" text="Chapter"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedication"/>
+ <gentext key="dedication" text="Dedication"/>
+ <gentext key="Edition" text="Edition"/>
+ <gentext key="edition" text="Edition"/>
+ <gentext key="Equation" text="Equation"/>
+ <gentext key="equation" text="Equation"/>
+ <gentext key="Example" text="Example"/>
+ <gentext key="example" text="Example"/>
+ <gentext key="Figure" text="Figure"/>
+ <gentext key="figure" text="Figure"/>
+ <gentext key="GlossSee" text="See"/>
+ <gentext key="glosssee" text="See"/>
+ <gentext key="GlossSeeAlso" text="See Also"/>
+ <gentext key="glossseealso" text="See Also"/>
+ <gentext key="Glossary" text="Glossary"/>
+ <gentext key="glossary" text="Glossary"/>
+ <gentext key="IMPORTANT" text="IMPORTANT"/>
+ <gentext key="important" text="Important"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Important"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text="Legal Notice"/>
+ <gentext key="legalnotice" text="Legal Notice"/>
+ <gentext key="MsgAud" text="Audience"/>
+ <gentext key="msgaud" text="Audience"/>
+ <gentext key="MsgLevel" text="Level"/>
+ <gentext key="msglevel" text="Level"/>
+ <gentext key="MsgOrig" text="Origin"/>
+ <gentext key="msgorig" text="Origin"/>
+ <gentext key="NOTE" text="NOTE"/>
+ <gentext key="Note" text="Note"/>
+ <gentext key="note" text="Note"/>
+ <gentext key="Part" text="Part"/>
+ <gentext key="part" text="Part"/>
+ <gentext key="Preface" text="Preface"/>
+ <gentext key="preface" text="Preface"/>
+ <gentext key="Procedure" text="Procedure"/>
+ <gentext key="procedure" text="Procedure"/>
+ <gentext key="Published" text="Published"/>
+ <gentext key="published" text="Published"/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Reference"/>
+ <gentext key="reference" text="Reference"/>
+ <gentext key="RefName" text="Name"/>
+ <gentext key="refname" text="Name"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Revision"/>
+ <gentext key="revision" text="Revision"/>
+ <gentext key="RevHistory" text="Revision History"/>
+ <gentext key="revhistory" text="Revision History"/>
+ <gentext key="Section" text="Section"/>
+ <gentext key="See" text="See"/>
+ <gentext key="see" text="See"/>
+ <gentext key="SeeAlso" text="See Also"/>
+ <gentext key="seealso" text="See Also"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Step"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="Table" text="Table"/>
+ <gentext key="table" text="Table"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="WARNING"/>
+ <gentext key="Warning" text="Warning"/>
+ <gentext key="warning" text="Warning"/>
+ <gentext key="appendix" text="appendix"/>
+ <gentext key="chapter" text="chapter"/>
+ <gentext key="section" text="Section"/>
+ <gentext key="sect1" text="Section"/>
+ <gentext key="sect2" text="Section"/>
+ <gentext key="sect3" text="Section"/>
+ <gentext key="sect4" text="Section"/>
+ <gentext key="sect5" text="Section"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="step" text="step"/>
+ <gentext key="Seealso" text="See also"/>
+ <gentext key="TableofContents" text="Table of Contents"/>
+ <gentext key="tableofcontents" text="Table of Contents"/>
+ <gentext key="in" text="in"/>
+ <gentext key="by" text="by"/>
+ <gentext key="Edited" text="Edited"/>
+ <gentext key="edited" text="Edited"/>
+ <gentext key="Editedby" text="Edited by"/>
+ <gentext key="editedby" text="Edited by"/>
+ <gentext key="and" text="and"/>
+ <gentext key="Notes" text="Notes"/>
+ <gentext key="notes" text="Notes"/>
+ <gentext key="TableNotes" text="Notes"/>
+ <gentext key="tablenotes" text="Notes"/>
+ <gentext key="nonexistantelement" text="non-existant element"/>
+ <gentext key="Pgs" text="Pgs."/>
+ <gentext key="pgs" text="Pgs."/>
+ <gentext key="unsupported" text="unsupported"/>
+ <gentext key="xrefto" text="xref to"/>
+ <gentext key="unexpectedelementname" text="Unexpected element name"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="List of Tables"/>
+ <gentext key="listoftables" text="List of Tables"/>
+ <gentext key="ListofExamples" text="List of Examples"/>
+ <gentext key="listofexamples" text="List of Examples"/>
+ <gentext key="ListofFigures" text="List of Figures"/>
+ <gentext key="listoffigures" text="List of Figures"/>
+ <gentext key="ListofEquations" text="List of Equations"/>
+ <gentext key="listofequations" text="List of Equations"/>
+ <gentext key="ListofUnknown" text="List of Unknown"/>
+ <gentext key="listofunknown" text="List of Unknown"/>
+ <gentext key="nav-prev" text="Prev"/>
+ <gentext key="nav-prev-sibling" text="Fast Backward"/>
+ <gentext key="nav-next-sibling" text="Fast Forward"/>
+ <gentext key="nav-next" text="Next"/>
+ <gentext key="nav-up" text="Up"/>
+ <gentext key="nav-home" text="Home"/>
+ <gentext key="sectioncalled" text="the section called"/>
+ <gentext key="index symbols" text="Symbols"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="List of Tables"/>
-<gentext key="ListofExamples" text="List of Examples"/>
-<gentext key="ListofFigures" text="List of Figures"/>
-<gentext key="ListofEquations" text="List of Equations"/>
-<gentext key="ListofUnknown" text="List of Unknown"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Appendix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Chapter %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Equation %n. %t"/>
+ <template name="example" text="Example %n. %t"/>
+ <template name="figure" text="Figure %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Part %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Table %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Prev"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="the section called" text="the section called"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<gentext key="index symbols" text="Symbols"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="xref">
+ <template name="appendix" text="Appendix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Chapter %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Example %n. %t"/>
+ <template name="figure" text="Figure %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Part %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="question" text="Q: %n"/>
+ <template name="answer" text="A: %n"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Table %n. %t"/>
+ </context>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+ <context name="section-xref">
+ <template name="sect1" text="the section called &#8220;%t&#8221;"/>
+ <template name="sect2" text="the section called &#8220;%t&#8221;"/>
+ <template name="sect3" text="the section called &#8220;%t&#8221;"/>
+ <template name="sect4" text="the section called &#8220;%t&#8221;"/>
+ <template name="sect5" text="the section called &#8220;%t&#8221;"/>
+ <template name="section" text="the section called &#8220;%t&#8221;"/>
+ <template name="simplesect" text="the section called &#8220;%t&#8221;"/>
+ </context>
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Section %n"/>
+ <template name="sect2" text="Section %n"/>
+ <template name="sect3" text="Section %n"/>
+ <template name="sect4" text="Section %n"/>
+ <template name="sect5" text="Section %n"/>
+ <template name="section" text="Section %n"/>
+ <template name="simplesect" text="the section called &#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" and "/>
+ <template name="seplast" text=", and "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="See "/>
+ <template name="seealso" text="See Also "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Level: "/>
+ <template name="MsgOrig" text="Origin: "/>
+ <template name="MsgAud" text="Audience: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/es.xml b/tests/docbook/common/es.xml
index 78483dfb..7f98d61b 100644
--- a/tests/docbook/common/es.xml
+++ b/tests/docbook/common/es.xml
@@ -1,98 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="es">
-<gentext key="abstract" text="Resumen"/>
-<gentext key="appendix" text="Ap&#x00E9;ndice"/>
-<gentext key="article" text="Art&#x00ED;culo"/>
-<gentext key="bibliography" text="Bibliograf&#x00ED;a"/>
-<gentext key="book" text="Libro"/>
-<gentext key="caution" text="ATENCI&#x00D3;N"/>
-<gentext key="caution" text="Atenci&#x00F3;n"/>
-<gentext key="chapter" text="Cap&#x00ED;tulo"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedicado"/>
-<gentext key="edition" text="Edici&#x00F3;n"/>
-<gentext key="equation" text="Ecuaci&#x00F3;n"/>
-<gentext key="example" text="Ejemplo"/>
-<gentext key="figure" text="Figura"/>
-<gentext key="glosssee" text="Ver"/>
-<gentext key="glossseealso" text="Ver tambi&#x00E9;n"/>
-<gentext key="glossary" text="Glosario"/>
-<gentext key="important" text="IMPORTANTE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Importante"/>
-<gentext key="index" text="&#x00CD;ndice"/>
-<gentext key="legalnotice" text="Aviso Legal"/>
-<gentext key="msgaud" text="Audiencia"/>
-<gentext key="msglevel" text="Nivel"/>
-<gentext key="msgorig" text="Origen"/>
-<gentext key="note" text="NOTA"/>
-<gentext key="note" text="Nota"/>
-<gentext key="part" text="Parte"/>
-<gentext key="preface" text="Prefacio"/>
-<gentext key="procedure" text="Procedimiento"/>
-<gentext key="pubdate" text="Fecha de publicaci&#x00F3;n"/>
-<gentext key="published" text="Publicado"/>
-<gentext key="refname" text="Nombre"/>
-<gentext key="reference" text="Referencia"/>
-<gentext key="revision" text="Revisi&#x00F3;n"/>
-<gentext key="revhistory" text="Historial de revisiones"/>
-<gentext key="section" text="Secci&#x00F3;n"/>
-<gentext key="see" text="Ver"/>
-<gentext key="seealso" text="Ver Tambi&#x00E9;n"/>
-<gentext key="set" text="Conjunto"/>
-<gentext key="setindex" text="&#x00CD;ndice del conjunto"/>
-<gentext key="sidebar" text="Sidebar"/>
-<gentext key="step" text="Paso"/>
-<gentext key="tip" text="SUGERENCIA"/>
-<gentext key="table" text="Tabla"/>
-<gentext key="tip" text="Sugerencia"/>
-<gentext key="warning" text="AVISO"/>
-<gentext key="warning" text="Aviso"/>
-<gentext key="appendix" text="ap&#x00E9;ndice"/>
-<gentext key="chapter" text="cap&#x00ED;tulo"/>
-<gentext key="section" text="secci&#x00F3;n"/>
-<gentext key="step" text="paso"/>
-<gentext key="seealso" text="Ver Tambi&#x00E9;n"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Tabla de contenidos"/>
-<gentext key="in" text="en"/>
-<gentext key="by" text="por"/>
-<gentext key="Edited" text="Editado"/>
-<gentext key="Editedby" text="Editado por"/>
-<gentext key="and" text="y"/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="nonexistantelement" text="elemento inexistente"/>
-<gentext key="Pgs" text="Pags."/>
-<gentext key="unsupported" text="no soportado"/>
-<gentext key="xrefto" text="referido a"/>
-<gentext key="unexpectedelementname" text="Nombre de elemento inesperado"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Resumen"/>
+ <gentext key="abstract" text="Resumen"/>
+ <gentext key="Answer" text="R:"/>
+ <gentext key="answer" text="R:"/>
+ <gentext key="Appendix" text="Ap&#233;ndice"/>
+ <gentext key="Article" text="Art&#237;culo"/>
+ <gentext key="article" text="Art&#237;culo"/>
+ <gentext key="Bibliography" text="Bibliograf&#237;a"/>
+ <gentext key="bibliography" text="Bibliograf&#237;a"/>
+ <gentext key="Book" text="Libro"/>
+ <gentext key="book" text="Libro"/>
+ <gentext key="CAUTION" text="ATENCI&#211;N"/>
+ <gentext key="caution" text="ATENCI&#211;N"/>
+ <gentext key="Caution" text="Atenci&#243;n"/>
+ <gentext key="caution" text="Atenci&#243;n"/>
+ <gentext key="Chapter" text="Cap&#237;tulo"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedicado"/>
+ <gentext key="dedication" text="Dedicado"/>
+ <gentext key="Edition" text="Edici&#243;n"/>
+ <gentext key="edition" text="Edici&#243;n"/>
+ <gentext key="Equation" text="Ecuaci&#243;n"/>
+ <gentext key="equation" text="Ecuaci&#243;n"/>
+ <gentext key="Example" text="Ejemplo"/>
+ <gentext key="example" text="Ejemplo"/>
+ <gentext key="Figure" text="Figura"/>
+ <gentext key="figure" text="Figura"/>
+ <gentext key="GlossSee" text="Ver"/>
+ <gentext key="glosssee" text="Ver"/>
+ <gentext key="GlossSeeAlso" text="Ver tambi&#233;n"/>
+ <gentext key="glossseealso" text="Ver tambi&#233;n"/>
+ <gentext key="Glossary" text="Glosario"/>
+ <gentext key="glossary" text="Glosario"/>
+ <gentext key="IMPORTANT" text="IMPORTANTE"/>
+ <gentext key="important" text="IMPORTANTE"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Importante"/>
+ <gentext key="important" text="Importante"/>
+ <gentext key="Index" text="&#205;ndice"/>
+ <gentext key="index" text="&#205;ndice"/>
+ <gentext key="LegalNotice" text="Aviso Legal"/>
+ <gentext key="legalnotice" text="Aviso Legal"/>
+ <gentext key="MsgAud" text="Audiencia"/>
+ <gentext key="msgaud" text="Audiencia"/>
+ <gentext key="MsgLevel" text="Nivel"/>
+ <gentext key="msglevel" text="Nivel"/>
+ <gentext key="MsgOrig" text="Origen"/>
+ <gentext key="msgorig" text="Origen"/>
+ <gentext key="NOTE" text="NOTA"/>
+ <gentext key="note" text="NOTA"/>
+ <gentext key="Note" text="Nota"/>
+ <gentext key="note" text="Nota"/>
+ <gentext key="Part" text="Parte"/>
+ <gentext key="part" text="Parte"/>
+ <gentext key="Preface" text="Prefacio"/>
+ <gentext key="preface" text="Prefacio"/>
+ <gentext key="Procedure" text="Procedimiento"/>
+ <gentext key="procedure" text="Procedimiento"/>
+ <gentext key="PubDate" text="Fecha de publicaci&#243;n"/>
+ <gentext key="pubdate" text="Fecha de publicaci&#243;n"/>
+ <gentext key="Published" text="Publicado"/>
+ <gentext key="published" text="Publicado"/>
+ <gentext key="Question" text="P:"/>
+ <gentext key="question" text="P:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Nombre"/>
+ <gentext key="refname" text="Nombre"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Reference" text="Referencia"/>
+ <gentext key="reference" text="Referencia"/>
+ <gentext key="Revision" text="Revisi&#243;n"/>
+ <gentext key="revision" text="Revisi&#243;n"/>
+ <gentext key="RevHistory" text="Historial de revisiones"/>
+ <gentext key="revhistory" text="Historial de revisiones"/>
+ <gentext key="Section" text="Secci&#243;n"/>
+ <gentext key="See" text="Ver"/>
+ <gentext key="see" text="Ver"/>
+ <gentext key="SeeAlso" text="Ver Tambi&#233;n"/>
+ <gentext key="seealso" text="Ver Tambi&#233;n"/>
+ <gentext key="Set" text="Conjunto"/>
+ <gentext key="set" text="Conjunto"/>
+ <gentext key="SetIndex" text="&#205;ndice del conjunto"/>
+ <gentext key="setindex" text="&#205;ndice del conjunto"/>
+ <gentext key="Sidebar" text="Sidebar"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="Step" text="Paso"/>
+ <gentext key="TIP" text="SUGERENCIA"/>
+ <gentext key="tip" text="SUGERENCIA"/>
+ <gentext key="Table" text="Tabla"/>
+ <gentext key="table" text="Tabla"/>
+ <gentext key="Tip" text="Sugerencia"/>
+ <gentext key="tip" text="Sugerencia"/>
+ <gentext key="WARNING" text="AVISO"/>
+ <gentext key="warning" text="AVISO"/>
+ <gentext key="Warning" text="Aviso"/>
+ <gentext key="warning" text="Aviso"/>
+ <gentext key="appendix" text="ap&#233;ndice"/>
+ <gentext key="chapter" text="cap&#237;tulo"/>
+ <gentext key="section" text="secci&#243;n"/>
+ <gentext key="step" text="paso"/>
+ <gentext key="Seealso" text="Ver Tambi&#233;n"/>
+ <gentext key="seealso" text="Ver Tambi&#233;n"/>
+ <gentext key="TableofContents" text="Tabla de contenidos"/>
+ <gentext key="tableofcontents" text="Tabla de contenidos"/>
+ <gentext key="in" text="en"/>
+ <gentext key="by" text="por"/>
+ <gentext key="Edited" text="Editado"/>
+ <gentext key="edited" text="Editado"/>
+ <gentext key="Editedby" text="Editado por"/>
+ <gentext key="editedby" text="Editado por"/>
+ <gentext key="and" text="y"/>
+ <gentext key="Notes" text="Notas"/>
+ <gentext key="notes" text="Notas"/>
+ <gentext key="TableNotes" text="Notas"/>
+ <gentext key="tablenotes" text="Notas"/>
+ <gentext key="nonexistantelement" text="elemento inexistente"/>
+ <gentext key="Pgs" text="Pags."/>
+ <gentext key="pgs" text="Pags."/>
+ <gentext key="unsupported" text="no soportado"/>
+ <gentext key="xrefto" text="referido a"/>
+ <gentext key="unexpectedelementname" text="Nombre de elemento inesperado"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Lista de tablas"/>
+ <gentext key="listoftables" text="Lista de tablas"/>
+ <gentext key="ListofExamples" text="Tabla de ejemplos"/>
+ <gentext key="listofexamples" text="Tabla de ejemplos"/>
+ <gentext key="ListofFigures" text="Tabla de figuras"/>
+ <gentext key="listoffigures" text="Tabla de figuras"/>
+ <gentext key="ListofEquations" text="Tabla de ecuaciones"/>
+ <gentext key="listofequations" text="Tabla de ecuaciones"/>
+ <gentext key="ListofUnknown" text="Lista de ???"/>
+ <gentext key="listofunknown" text="Lista de ???"/>
+ <gentext key="nav-prev" text="Anterior"/>
+ <gentext key="nav-prev-sibling" text="Retroceder"/>
+ <gentext key="nav-next-sibling" text="Avanzar"/>
+ <gentext key="nav-next" text="Siguiente"/>
+ <gentext key="nav-up" text="Subir"/>
+ <gentext key="nav-home" text="Inicio"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Lista de tablas"/>
-<gentext key="ListofExamples" text="Tabla de ejemplos"/>
-<gentext key="ListofFigures" text="Tabla de figuras"/>
-<gentext key="ListofEquations" text="Tabla de ecuaciones"/>
-<gentext key="ListofUnknown" text="Lista de ???"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Ap&#233;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Ecuaci&#243;n %n. %t"/>
+ <template name="example" text="Ejemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabla %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Anterior"/>
-<gentext key="nav-prev-sibling" text="Retroceder"/>
-<gentext key="nav-next-sibling" text="Avanzar"/>
-<gentext key="nav-next" text="Siguiente"/>
-<gentext key="nav-up" text="Subir"/>
-<gentext key="nav-home" text="Inicio"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Ap&#233;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Ejemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabla %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Secci&#243;n %n"/>
+ <template name="sect2" text="Secci&#243;n %n"/>
+ <template name="sect3" text="Secci&#243;n %n"/>
+ <template name="sect4" text="Secci&#243;n %n"/>
+ <template name="sect5" text="Secci&#243;n %n"/>
+ <template name="section" text="Secci&#243;n %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" y "/>
+ <template name="seplast" text=", y "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Ver "/>
+ <template name="seealso" text="Ver tambi&#233;n "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Nivel: "/>
+ <template name="MsgOrig" text="Origen: "/>
+ <template name="MsgAud" text="Audiencia: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/et.xml b/tests/docbook/common/et.xml
index 4c63adbe..f734a058 100644
--- a/tests/docbook/common/et.xml
+++ b/tests/docbook/common/et.xml
@@ -1,104 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="et">
-<gentext key="abstract" text="&#220;levaade"/>
-<gentext key="answer" text="V:"/>
-<gentext key="appendix" text="Lisa"/>
-<gentext key="article" text="Artikkel"/>
-<gentext key="bibliography" text="Bibliograafia"/>
-<gentext key="book" text="Raamat"/>
-<gentext key="caution" text="ETTEVAATUST"/>
-<gentext key="caution" text="Ettevaatust"/>
-<gentext key="chapter" text="Peat&#252;kk"/>
-<gentext key="colophon" text="L&#245;pum&#228;rgis"/>
-<gentext key="copyright" text="Autori&#245;igus"/>
-<gentext key="dedication" text="P&#252;hendus"/>
-<gentext key="edition" text="V&#228;ljaanne"/>
-<gentext key="equation" text="Valem"/>
-<gentext key="example" text="N&#228;ide"/>
-<gentext key="figure" text="Joonis"/>
-<gentext key="glosssee" text="Vt."/>
-<gentext key="glossseealso" text="Vt. ka"/>
-<gentext key="glossary" text="S&#245;nastik"/>
-<gentext key="important" text="OLULINE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Oluline"/>
-<gentext key="index" text="Aineregister"/>
-<gentext key="legalnotice" text="Autori&#245;iguse m&#228;rge"/>
-<gentext key="msgaud" text="Auditoorium"/>
-<gentext key="msglevel" text="Tase"/>
-<gentext key="msgorig" text="Algallikas"/>
-<gentext key="note" text="M&#196;RKUS"/>
-<gentext key="note" text="M&#228;rkus"/>
-<gentext key="part" text="Osa"/>
-<gentext key="preface" text="Eess&#245;na"/>
-<gentext key="procedure" text="Protseduur"/>
-<gentext key="published" text="Avaldatud"/>
-<gentext key="question" text="K:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Viide"/>
-<gentext key="refname" text="Nimi"/>
-<gentext key="refsection" text="L&#245;ik"/>
-<gentext key="refsynopsisdiv" text="S&#252;nopsis"/>
-<gentext key="revision" text="Vigade parandus"/>
-<gentext key="revhistory" text="Vigade paranduste ajalugu"/>
-<gentext key="section" text="Sektsioon"/>
-<gentext key="see" text="Vt."/>
-<gentext key="seealso" text="Vt. ka"/>
-<gentext key="set" text="Sea"/>
-<gentext key="setindex" text="Sea indeks"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Samm"/>
-<gentext key="tip" text="VIHJE"/>
-<gentext key="table" text="Tabel"/>
-<gentext key="tip" text="Vihje"/>
-<gentext key="warning" text="HOIATUS"/>
-<gentext key="warning" text="Hoiatus"/>
-<gentext key="appendix" text="lisa"/>
-<gentext key="chapter" text="peat&#252;kk"/>
-<gentext key="section" text="l&#245;ik"/>
-<gentext key="sidebar" text="k&#252;lgriba"/>
-<gentext key="step" text="samm"/>
-<gentext key="seealso" text="Vt. ka"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Sisukord"/>
-<gentext key="in" text=""/>
-<gentext key="by" text=""/>
-<gentext key="Edited" text="Redaktsioon"/>
-<gentext key="Editedby" text="Redaktsiooni autor(id)"/>
-<gentext key="and" text="ja"/>
-<gentext key="Notes" text="M&#228;rkused"/>
-<gentext key="TableNotes" text="M&#228;rkused"/>
-<gentext key="nonexistantelement" text="mitte eksisteeriv element"/>
-<gentext key="Pgs" text="Lk."/>
-<gentext key="unsupported" text="toetuseta"/>
-<gentext key="xrefto" text="viide"/>
-<gentext key="unexpectedelementname" text="Ootamatu elemendi nimi"/>
-<gentext key="Revisedby" text="&#220;le vaadanud: "/>
+ <gentext key="Abstract" text="&#220;levaade"/>
+ <gentext key="abstract" text="&#220;levaade"/>
+ <gentext key="Answer" text="V:"/>
+ <gentext key="answer" text="V:"/>
+ <gentext key="Appendix" text="Lisa"/>
+ <gentext key="Article" text="Artikkel"/>
+ <gentext key="article" text="Artikkel"/>
+ <gentext key="Bibliography" text="Bibliograafia"/>
+ <gentext key="bibliography" text="Bibliograafia"/>
+ <gentext key="Book" text="Raamat"/>
+ <gentext key="book" text="Raamat"/>
+ <gentext key="CAUTION" text="ETTEVAATUST"/>
+ <gentext key="caution" text="ETTEVAATUST"/>
+ <gentext key="Caution" text="Ettevaatust"/>
+ <gentext key="caution" text="Ettevaatust"/>
+ <gentext key="Chapter" text="Peat&#252;kk"/>
+ <gentext key="Colophon" text="L&#245;pum&#228;rgis"/>
+ <gentext key="colophon" text="L&#245;pum&#228;rgis"/>
+ <gentext key="Copyright" text="Autori&#245;igus"/>
+ <gentext key="copyright" text="Autori&#245;igus"/>
+ <gentext key="Dedication" text="P&#252;hendus"/>
+ <gentext key="dedication" text="P&#252;hendus"/>
+ <gentext key="Edition" text="V&#228;ljaanne"/>
+ <gentext key="edition" text="V&#228;ljaanne"/>
+ <gentext key="Equation" text="Valem"/>
+ <gentext key="equation" text="Valem"/>
+ <gentext key="Example" text="N&#228;ide"/>
+ <gentext key="example" text="N&#228;ide"/>
+ <gentext key="Figure" text="Joonis"/>
+ <gentext key="figure" text="Joonis"/>
+ <gentext key="GlossSee" text="Vt."/>
+ <gentext key="glosssee" text="Vt."/>
+ <gentext key="GlossSeeAlso" text="Vt. ka"/>
+ <gentext key="glossseealso" text="Vt. ka"/>
+ <gentext key="Glossary" text="S&#245;nastik"/>
+ <gentext key="glossary" text="S&#245;nastik"/>
+ <gentext key="IMPORTANT" text="OLULINE"/>
+ <gentext key="important" text="OLULINE"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Oluline"/>
+ <gentext key="important" text="Oluline"/>
+ <gentext key="Index" text="Aineregister"/>
+ <gentext key="index" text="Aineregister"/>
+ <gentext key="LegalNotice" text="Autori&#245;iguse m&#228;rge"/>
+ <gentext key="legalnotice" text="Autori&#245;iguse m&#228;rge"/>
+ <gentext key="MsgAud" text="Auditoorium"/>
+ <gentext key="msgaud" text="Auditoorium"/>
+ <gentext key="MsgLevel" text="Tase"/>
+ <gentext key="msglevel" text="Tase"/>
+ <gentext key="MsgOrig" text="Algallikas"/>
+ <gentext key="msgorig" text="Algallikas"/>
+ <gentext key="NOTE" text="M&#196;RKUS"/>
+ <gentext key="note" text="M&#196;RKUS"/>
+ <gentext key="Note" text="M&#228;rkus"/>
+ <gentext key="note" text="M&#228;rkus"/>
+ <gentext key="Part" text="Osa"/>
+ <gentext key="part" text="Osa"/>
+ <gentext key="Preface" text="Eess&#245;na"/>
+ <gentext key="preface" text="Eess&#245;na"/>
+ <gentext key="Procedure" text="Protseduur"/>
+ <gentext key="procedure" text="Protseduur"/>
+ <gentext key="Published" text="Avaldatud"/>
+ <gentext key="published" text="Avaldatud"/>
+ <gentext key="Question" text="K:"/>
+ <gentext key="question" text="K:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Viide"/>
+ <gentext key="reference" text="Viide"/>
+ <gentext key="RefName" text="Nimi"/>
+ <gentext key="refname" text="Nimi"/>
+ <gentext key="RefSection" text="L&#245;ik"/>
+ <gentext key="refsection" text="L&#245;ik"/>
+ <gentext key="RefSynopsisDiv" text="S&#252;nopsis"/>
+ <gentext key="refsynopsisdiv" text="S&#252;nopsis"/>
+ <gentext key="Revision" text="Vigade parandus"/>
+ <gentext key="revision" text="Vigade parandus"/>
+ <gentext key="RevHistory" text="Vigade paranduste ajalugu"/>
+ <gentext key="revhistory" text="Vigade paranduste ajalugu"/>
+ <gentext key="Section" text="Sektsioon"/>
+ <gentext key="See" text="Vt."/>
+ <gentext key="see" text="Vt."/>
+ <gentext key="SeeAlso" text="Vt. ka"/>
+ <gentext key="seealso" text="Vt. ka"/>
+ <gentext key="Set" text="Sea"/>
+ <gentext key="set" text="Sea"/>
+ <gentext key="SetIndex" text="Sea indeks"/>
+ <gentext key="setindex" text="Sea indeks"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Samm"/>
+ <gentext key="TIP" text="VIHJE"/>
+ <gentext key="tip" text="VIHJE"/>
+ <gentext key="Table" text="Tabel"/>
+ <gentext key="table" text="Tabel"/>
+ <gentext key="Tip" text="Vihje"/>
+ <gentext key="tip" text="Vihje"/>
+ <gentext key="WARNING" text="HOIATUS"/>
+ <gentext key="warning" text="HOIATUS"/>
+ <gentext key="Warning" text="Hoiatus"/>
+ <gentext key="warning" text="Hoiatus"/>
+ <gentext key="appendix" text="lisa"/>
+ <gentext key="chapter" text="peat&#252;kk"/>
+ <gentext key="section" text="l&#245;ik"/>
+ <gentext key="sidebar" text="k&#252;lgriba"/>
+ <gentext key="step" text="samm"/>
+ <gentext key="Seealso" text="Vt. ka"/>
+ <gentext key="seealso" text="Vt. ka"/>
+ <gentext key="TableofContents" text="Sisukord"/>
+ <gentext key="tableofcontents" text="Sisukord"/>
+ <gentext key="in" text=""/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="Redaktsioon"/>
+ <gentext key="edited" text="Redaktsioon"/>
+ <gentext key="Editedby" text="Redaktsiooni autor(id)"/>
+ <gentext key="editedby" text="Redaktsiooni autor(id)"/>
+ <gentext key="and" text="ja"/>
+ <gentext key="Notes" text="M&#228;rkused"/>
+ <gentext key="notes" text="M&#228;rkused"/>
+ <gentext key="TableNotes" text="M&#228;rkused"/>
+ <gentext key="tablenotes" text="M&#228;rkused"/>
+ <gentext key="nonexistantelement" text="mitte eksisteeriv element"/>
+ <gentext key="Pgs" text="Lk."/>
+ <gentext key="pgs" text="Lk."/>
+ <gentext key="unsupported" text="toetuseta"/>
+ <gentext key="xrefto" text="viide"/>
+ <gentext key="unexpectedelementname" text="Ootamatu elemendi nimi"/>
+ <gentext key="Revisedby" text="&#220;le vaadanud: "/>
+ <gentext key="revisedby" text="&#220;le vaadanud: "/>
+ <gentext key="ListofTables" text="Tabelite nimekiri"/>
+ <gentext key="listoftables" text="Tabelite nimekiri"/>
+ <gentext key="ListofExamples" text="N&#228;idete nimekiri"/>
+ <gentext key="listofexamples" text="N&#228;idete nimekiri"/>
+ <gentext key="ListofFigures" text="Jooniste nimekiri"/>
+ <gentext key="listoffigures" text="Jooniste nimekiri"/>
+ <gentext key="ListofEquations" text="Valemite nimekiri"/>
+ <gentext key="listofequations" text="Valemite nimekiri"/>
+ <gentext key="ListofUnknown" text="Tundmatute nimekiri"/>
+ <gentext key="listofunknown" text="Tundmatute nimekiri"/>
+ <gentext key="nav-prev" text="Eelmine"/>
+ <gentext key="nav-prev-sibling" text="Kiiresti tagasi"/>
+ <gentext key="nav-next-sibling" text="Kiiresti edasi"/>
+ <gentext key="nav-next" text="J&#228;rgmine"/>
+ <gentext key="nav-up" text="&#220;les"/>
+ <gentext key="nav-home" text="Koju"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Tabelite nimekiri"/>
-<gentext key="ListofExamples" text="N&#228;idete nimekiri"/>
-<gentext key="ListofFigures" text="Jooniste nimekiri"/>
-<gentext key="ListofEquations" text="Valemite nimekiri"/>
-<gentext key="ListofUnknown" text="Tundmatute nimekiri"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Lisa %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Peat&#252;kk %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Valem %n. %t"/>
+ <template name="example" text="N&#228;ide %n. %t"/>
+ <template name="figure" text="Joonis %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Osa %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Eelmine"/>
-<gentext key="nav-prev-sibling" text="Kiiresti tagasi"/>
-<gentext key="nav-next-sibling" text="Kiiresti edasi"/>
-<gentext key="nav-next" text="J&#228;rgmine"/>
-<gentext key="nav-up" text="&#220;les"/>
-<gentext key="nav-home" text="Koju"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Lisa %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Peat&#252;kk %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="N&#228;ide %n. %t"/>
+ <template name="figure" text="Joonis %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Osa %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Sektsioon %n"/>
+ <template name="sect2" text="Sektsioon %n"/>
+ <template name="sect3" text="Sektsioon %n"/>
+ <template name="sect4" text="Sektsioon %n"/>
+ <template name="sect5" text="Sektsioon %n"/>
+ <template name="section" text="Sektsioon %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" ja "/>
+ <template name="seplast" text=", ja "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Vt. "/>
+ <template name="seealso" text="Vt. ka "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Tase: "/>
+ <template name="MsgOrig" text="Algallikas: "/>
+ <template name="MsgAud" text="Auditoorium: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/fi.xml b/tests/docbook/common/fi.xml
index 5d257255..6e9bd28b 100644
--- a/tests/docbook/common/fi.xml
+++ b/tests/docbook/common/fi.xml
@@ -1,98 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="fi">
-<gentext key="abstract" text="Lyhennelm&#228;"/>
-<gentext key="appendix" text="Liite"/>
-<gentext key="article" text="Artikkeli"/>
-<gentext key="bibliography" text="L&#228;hteet"/>
-<gentext key="book" text="Kirja"/>
-<gentext key="caution" text="VARO"/>
-<gentext key="caution" text="Varo"/>
-<gentext key="chapter" text="Luku"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Omistus"/>
-<gentext key="edition" text="Edition"/>
-<gentext key="equation" text="Kaava"/>
-<gentext key="example" text="Esimerkki"/>
-<gentext key="figure" text="Kuva"/>
-<gentext key="glosssee" text="Katso"/>
-<gentext key="glossseealso" text="Katso my&#246;s"/>
-<gentext key="glossary" text="Sanasto"/>
-<gentext key="important" text="T&#196;RKE&#196;&#196;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="T&#228;rke&#228;&#228;"/>
-<gentext key="index" text="Indeksi"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="Yleis&#246;"/>
-<gentext key="msglevel" text="Taso"/>
-<gentext key="msgorig" text="Alkuper&#228;"/>
-<gentext key="note" text="HUOMAA"/>
-<gentext key="note" text="Huomaa"/>
-<gentext key="part" text="Osa"/>
-<gentext key="preface" text="Esipuhe"/>
-<gentext key="procedure" text="Aliohjelma"/>
-<gentext key="published" text="Julkaistu"/>
-<gentext key="refname" text="Nimi"/>
-<gentext key="reference" text="L&#228;hdeluettelo"/>
-<gentext key="revision" text="Versio"/>
-<gentext key="revhistory" text="Versiohistoria"/>
-<gentext key="section" text="Kohta"/>
-<gentext key="see" text="Katso"/>
-<gentext key="seealso" text="Katso my&#246;s"/>
-<gentext key="set" text="Kokoelma"/>
-<gentext key="setindex" text="Kokoelman indeksi"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Step"/>
-<gentext key="tip" text="VIHJE"/>
-<gentext key="table" text="Taulu"/>
-<gentext key="tip" text="Vihje"/>
-<gentext key="warning" text="VAROITUS"/>
-<gentext key="warning" text="Varoitus"/>
-<gentext key="appendix" text="liite"/>
-<gentext key="chapter" text="luku"/>
-<gentext key="section" text="kohta"/>
-<gentext key="sidebar" text="sivupalkki"/>
-<gentext key="step" text="step"/>
-<gentext key="seealso" text="Katso my&#246;s"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Sis&#228;llys"/>
-<gentext key="in" text="teoksessa"/>
-<gentext key="by" text=""/>
-<gentext key="Edited" text="Toim."/>
-<gentext key="Editedby" text="Toimittanut"/>
-<gentext key="and" text="ja"/>
-<gentext key="Notes" text=""/>
-<gentext key="TableNotes" text=""/>
-<gentext key="nonexistantelement" text="elementti&#228; ei ole olemassa"/>
-<gentext key="Pgs" text="Sivut"/>
-<gentext key="unsupported" text="ei tueta"/>
-<gentext key="xrefto" text="xref johonkin"/>
-<gentext key="unexpectedelementname" text="Odottamaton elementin nimi"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Lyhennelm&#228;"/>
+ <gentext key="abstract" text="Lyhennelm&#228;"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Liite"/>
+ <gentext key="Article" text="Artikkeli"/>
+ <gentext key="article" text="Artikkeli"/>
+ <gentext key="Bibliography" text="L&#228;hteet"/>
+ <gentext key="bibliography" text="L&#228;hteet"/>
+ <gentext key="Book" text="Kirja"/>
+ <gentext key="book" text="Kirja"/>
+ <gentext key="CAUTION" text="VARO"/>
+ <gentext key="caution" text="VARO"/>
+ <gentext key="Caution" text="Varo"/>
+ <gentext key="caution" text="Varo"/>
+ <gentext key="Chapter" text="Luku"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Omistus"/>
+ <gentext key="dedication" text="Omistus"/>
+ <gentext key="Edition" text="Edition"/>
+ <gentext key="edition" text="Edition"/>
+ <gentext key="Equation" text="Kaava"/>
+ <gentext key="equation" text="Kaava"/>
+ <gentext key="Example" text="Esimerkki"/>
+ <gentext key="example" text="Esimerkki"/>
+ <gentext key="Figure" text="Kuva"/>
+ <gentext key="figure" text="Kuva"/>
+ <gentext key="GlossSee" text="Katso"/>
+ <gentext key="glosssee" text="Katso"/>
+ <gentext key="GlossSeeAlso" text="Katso my&#246;s"/>
+ <gentext key="glossseealso" text="Katso my&#246;s"/>
+ <gentext key="Glossary" text="Sanasto"/>
+ <gentext key="glossary" text="Sanasto"/>
+ <gentext key="IMPORTANT" text="T&#196;RKE&#196;&#196;"/>
+ <gentext key="important" text="T&#196;RKE&#196;&#196;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="T&#228;rke&#228;&#228;"/>
+ <gentext key="important" text="T&#228;rke&#228;&#228;"/>
+ <gentext key="Index" text="Indeksi"/>
+ <gentext key="index" text="Indeksi"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="Yleis&#246;"/>
+ <gentext key="msgaud" text="Yleis&#246;"/>
+ <gentext key="MsgLevel" text="Taso"/>
+ <gentext key="msglevel" text="Taso"/>
+ <gentext key="MsgOrig" text="Alkuper&#228;"/>
+ <gentext key="msgorig" text="Alkuper&#228;"/>
+ <gentext key="NOTE" text="HUOMAA"/>
+ <gentext key="note" text="HUOMAA"/>
+ <gentext key="Note" text="Huomaa"/>
+ <gentext key="note" text="Huomaa"/>
+ <gentext key="Part" text="Osa"/>
+ <gentext key="part" text="Osa"/>
+ <gentext key="Preface" text="Esipuhe"/>
+ <gentext key="preface" text="Esipuhe"/>
+ <gentext key="Procedure" text="Aliohjelma"/>
+ <gentext key="procedure" text="Aliohjelma"/>
+ <gentext key="Published" text="Julkaistu"/>
+ <gentext key="published" text="Julkaistu"/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Nimi"/>
+ <gentext key="refname" text="Nimi"/>
+ <gentext key="Reference" text="L&#228;hdeluettelo"/>
+ <gentext key="reference" text="L&#228;hdeluettelo"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Versio"/>
+ <gentext key="revision" text="Versio"/>
+ <gentext key="RevHistory" text="Versiohistoria"/>
+ <gentext key="revhistory" text="Versiohistoria"/>
+ <gentext key="Section" text="Kohta"/>
+ <gentext key="See" text="Katso"/>
+ <gentext key="see" text="Katso"/>
+ <gentext key="SeeAlso" text="Katso my&#246;s"/>
+ <gentext key="seealso" text="Katso my&#246;s"/>
+ <gentext key="Set" text="Kokoelma"/>
+ <gentext key="set" text="Kokoelma"/>
+ <gentext key="SetIndex" text="Kokoelman indeksi"/>
+ <gentext key="setindex" text="Kokoelman indeksi"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Step"/>
+ <gentext key="TIP" text="VIHJE"/>
+ <gentext key="tip" text="VIHJE"/>
+ <gentext key="Table" text="Taulu"/>
+ <gentext key="table" text="Taulu"/>
+ <gentext key="Tip" text="Vihje"/>
+ <gentext key="tip" text="Vihje"/>
+ <gentext key="WARNING" text="VAROITUS"/>
+ <gentext key="warning" text="VAROITUS"/>
+ <gentext key="Warning" text="Varoitus"/>
+ <gentext key="warning" text="Varoitus"/>
+ <gentext key="appendix" text="liite"/>
+ <gentext key="chapter" text="luku"/>
+ <gentext key="section" text="kohta"/>
+ <gentext key="sidebar" text="sivupalkki"/>
+ <gentext key="step" text="step"/>
+ <gentext key="Seealso" text="Katso my&#246;s"/>
+ <gentext key="seealso" text="Katso my&#246;s"/>
+ <gentext key="TableofContents" text="Sis&#228;llys"/>
+ <gentext key="tableofcontents" text="Sis&#228;llys"/>
+ <gentext key="in" text="teoksessa"/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="Toim."/>
+ <gentext key="edited" text="Toim."/>
+ <gentext key="Editedby" text="Toimittanut"/>
+ <gentext key="editedby" text="Toimittanut"/>
+ <gentext key="and" text="ja"/>
+ <gentext key="Notes" text=""/>
+ <gentext key="notes" text=""/>
+ <gentext key="TableNotes" text=""/>
+ <gentext key="tablenotes" text=""/>
+ <gentext key="nonexistantelement" text="elementti&#228; ei ole olemassa"/>
+ <gentext key="Pgs" text="Sivut"/>
+ <gentext key="pgs" text="Sivut"/>
+ <gentext key="unsupported" text="ei tueta"/>
+ <gentext key="xrefto" text="xref johonkin"/>
+ <gentext key="unexpectedelementname" text="Odottamaton elementin nimi"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Luettelo tauluista"/>
+ <gentext key="listoftables" text="Luettelo tauluista"/>
+ <gentext key="ListofExamples" text="Luettelo esimerkeist&#228;"/>
+ <gentext key="listofexamples" text="Luettelo esimerkeist&#228;"/>
+ <gentext key="ListofFigures" text="Luettelo kuvista"/>
+ <gentext key="listoffigures" text="Luettelo kuvista"/>
+ <gentext key="ListofEquations" text="Luettelo esimerkeist&#228;"/>
+ <gentext key="listofequations" text="Luettelo esimerkeist&#228;"/>
+ <gentext key="ListofUnknown" text="Luettelo tuntemattomista"/>
+ <gentext key="listofunknown" text="Luettelo tuntemattomista"/>
+ <gentext key="nav-prev" text="Edellinen"/>
+ <gentext key="nav-prev-sibling" text="Nopeasti taaksep&#228;in"/>
+ <gentext key="nav-next-sibling" text="Nopeasti eteenp&#228;in"/>
+ <gentext key="nav-next" text="Seuraava"/>
+ <gentext key="nav-up" text="Yl&#246;s"/>
+ <gentext key="nav-home" text="Alkuun"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Luettelo tauluista"/>
-<gentext key="ListofExamples" text="Luettelo esimerkeist&#228;"/>
-<gentext key="ListofFigures" text="Luettelo kuvista"/>
-<gentext key="ListofEquations" text="Luettelo esimerkeist&#228;"/>
-<gentext key="ListofUnknown" text="Luettelo tuntemattomista"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Liite %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Luku %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Kaava %n. %t"/>
+ <template name="example" text="Esimerkki %n. %t"/>
+ <template name="figure" text="Kuva %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Osa %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Taulu %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Edellinen"/>
-<gentext key="nav-prev-sibling" text="Nopeasti taaksep&#x00E4;in"/>
-<gentext key="nav-next-sibling" text="Nopeasti eteenp&#x00E4;in"/>
-<gentext key="nav-next" text="Seuraava"/>
-<gentext key="nav-up" text="Yl&#x00F6;s"/>
-<gentext key="nav-home" text="Alkuun"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Liite %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Luku %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Esimerkki %n. %t"/>
+ <template name="figure" text="Kuva %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Osa %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Taulu %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Kohta %n"/>
+ <template name="sect2" text="Kohta %n"/>
+ <template name="sect3" text="Kohta %n"/>
+ <template name="sect4" text="Kohta %n"/>
+ <template name="sect5" text="Kohta %n"/>
+ <template name="section" text="Kohta %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" ja "/>
+ <template name="seplast" text=", ja "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Katso "/>
+ <template name="seealso" text="Katso my&#246;s "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Taso: "/>
+ <template name="MsgOrig" text="Alkuper&#228;: "/>
+ <template name="MsgAud" text="Yleis&#246;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/fr.xml b/tests/docbook/common/fr.xml
index f99c07f4..4bea8b8d 100644
--- a/tests/docbook/common/fr.xml
+++ b/tests/docbook/common/fr.xml
@@ -1,99 +1,341 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="fr">
-<gentext key="abstract" text="R&#x00E9;sum&#x00E9;"/>
-<gentext key="answer" text="R:"/>
-<gentext key="appendix" text="Annexe"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliographie"/>
-<gentext key="book" text="Livre"/>
-<gentext key="caution" text="Attention"/>
-<gentext key="chapter" text="Chapitre"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="D&#x00E9;dicace"/>
-<gentext key="edition" text="&#x00C9;dition"/>
-<gentext key="equation" text="&#x00C9;quation"/>
-<gentext key="example" text="Exemple"/>
-<gentext key="figure" text="Figure"/>
-<gentext key="glosssee" text="Voir"/>
-<gentext key="glossseealso" text="Voir aussi"/>
-<gentext key="glossary" text="Glossaire"/>
-<gentext key="important" text="IMPORTANT"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Important"/>
-<gentext key="index" text="Index"/>
-<gentext key="legalnotice" text="Note l&#x00E9;gale"/>
-<gentext key="msgaud" text="Public vis&#x00E9;"/>
-<gentext key="msglevel" text="Niveau"/>
-<gentext key="msgorig" text="Origine"/>
-<gentext key="note" text="Note"/>
-<gentext key="part" text="Partie"/>
-<gentext key="preface" text="Pr&#x00E9;face"/>
-<gentext key="procedure" text="Proc&#x00E9;dure"/>
-<gentext key="published" text="Publi&#x00E9;"/>
-<gentext key="question" text="Q:"/>
-<gentext key="refentry" text=""/>
-<gentext key="refname" text="Nom"/>
-<gentext key="refsection" text=""/>
-<gentext key="reference" text="R&#x00E9;f&#x00E9;rence"/>
-<gentext key="revhistory" text="Historique des versions"/>
-<gentext key="revision" text="Version"/>
-<gentext key="section" text="Section"/>
-<gentext key="see" text="Voir"/>
-<gentext key="seealso" text="Voir Aussi"/>
-<gentext key="seealso" text="Voir aussi"/>
-<gentext key="set" text="Ensemble"/>
-<gentext key="setindex" text="Index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="&#x00C9;tape"/>
-<gentext key="tip" text="TUYAU"/>
-<gentext key="table" text="Tableau"/>
-<gentext key="tip" text="Tuyau"/>
-<gentext key="warning" text="Avertissement"/>
-<gentext key="appendix" text="annexe"/>
-<gentext key="chapter" text="chapitre"/>
-<gentext key="sidebar" text=""/>
-<gentext key="section" text="section"/>
-<gentext key="step" text="&#x00E9;tape"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Table des mati&#x00E8;res"/>
-<gentext key="in" text="dans"/>
-<gentext key="by" text="par"/>
-<gentext key="Edited" text="Publi&#x00E9;"/>
-<gentext key="Editedby" text="Publi&#x00E9; par"/>
-<gentext key="and" text="et"/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="TableNotes" text="Remarques"/>
-<gentext key="nonexistantelement" text="Cet &#x00E9;l&#x00E9;ment n'existe pas"/>
-<gentext key="Pgs" text="Pages"/>
-<gentext key="unsupported" text="Non reconnu par le syst&#x00E8;me"/>
-<gentext key="xrefto" text="R&#x00E9;f&#x00E9;rence vers"/>
-<gentext key="unexpectedelementname" text="Nom d'&#x00E9;l&#x00E9;ment non attendu"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="R&#233;sum&#233;"/>
+ <gentext key="abstract" text="R&#233;sum&#233;"/>
+ <gentext key="Answer" text="R&#160;:"/>
+ <gentext key="answer" text="R&#160;:"/>
+ <gentext key="Appendix" text="Annexe"/>
+ <gentext key="Article" text="Article"/>
+ <gentext key="article" text="Article"/>
+ <gentext key="Bibliography" text="Bibliographie"/>
+ <gentext key="bibliography" text="Bibliographie"/>
+ <gentext key="Book" text="Livre"/>
+ <gentext key="book" text="Livre"/>
+ <gentext key="CAUTION" text="ATTENTION"/>
+ <gentext key="caution" text="ATTENTION"/>
+ <gentext key="Caution" text="Attention"/>
+ <gentext key="caution" text="Attention"/>
+ <gentext key="Chapter" text="Chapitre"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="D&#233;dicace"/>
+ <gentext key="dedication" text="D&#233;dicace"/>
+ <gentext key="Edition" text="&#201;dition"/>
+ <gentext key="edition" text="&#201;dition"/>
+ <gentext key="Equation" text="&#201;quation"/>
+ <gentext key="equation" text="&#201;quation"/>
+ <gentext key="Example" text="Exemple"/>
+ <gentext key="example" text="Exemple"/>
+ <gentext key="Figure" text="Figure"/>
+ <gentext key="figure" text="Figure"/>
+ <gentext key="GlossSee" text="Voir"/>
+ <gentext key="glosssee" text="Voir"/>
+ <gentext key="GlossSeeAlso" text="Voir aussi"/>
+ <gentext key="glossseealso" text="Voir aussi"/>
+ <gentext key="Glossary" text="Glossaire"/>
+ <gentext key="glossary" text="Glossaire"/>
+ <gentext key="IMPORTANT" text="IMPORTANT"/>
+ <gentext key="important" text="IMPORTANT"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Important"/>
+ <gentext key="important" text="Important"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text="Note l&#233;gale"/>
+ <gentext key="legalnotice" text="Note l&#233;gale"/>
+ <gentext key="MsgAud" text="Public vis&#233;"/>
+ <gentext key="msgaud" text="Public vis&#233;"/>
+ <gentext key="MsgLevel" text="Niveau"/>
+ <gentext key="msglevel" text="Niveau"/>
+ <gentext key="MsgOrig" text="Origine"/>
+ <gentext key="msgorig" text="Origine"/>
+ <gentext key="NOTE" text="NOTE"/>
+ <gentext key="note" text="NOTE"/>
+ <gentext key="Note" text="Note"/>
+ <gentext key="note" text="Note"/>
+ <gentext key="Part" text="Partie"/>
+ <gentext key="part" text="Partie"/>
+ <gentext key="Preface" text="Pr&#233;face"/>
+ <gentext key="preface" text="Pr&#233;face"/>
+ <gentext key="Procedure" text="Proc&#233;dure"/>
+ <gentext key="procedure" text="Proc&#233;dure"/>
+ <gentext key="Published" text="Publi&#233;"/>
+ <gentext key="published" text="Publi&#233;"/>
+ <gentext key="Question" text="Q&#160;:"/>
+ <gentext key="question" text="Q&#160;:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Nom"/>
+ <gentext key="refname" text="Nom"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Reference" text="R&#233;f&#233;rence"/>
+ <gentext key="reference" text="R&#233;f&#233;rence"/>
+ <gentext key="RevHistory" text="Historique des versions"/>
+ <gentext key="revhistory" text="Historique des versions"/>
+ <gentext key="Revision" text="Version"/>
+ <gentext key="revision" text="Version"/>
+ <gentext key="Section" text="Section"/>
+ <gentext key="See" text="Voir"/>
+ <gentext key="see" text="Voir"/>
+ <gentext key="SeeAlso" text="Voir Aussi"/>
+ <gentext key="seealso" text="Voir Aussi"/>
+ <gentext key="Seealso" text="Voir aussi"/>
+ <gentext key="seealso" text="Voir aussi"/>
+ <gentext key="Set" text="Ensemble"/>
+ <gentext key="set" text="Ensemble"/>
+ <gentext key="SetIndex" text="Index"/>
+ <gentext key="setindex" text="Index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="&#201;tape"/>
+ <gentext key="TIP" text="TUYAU"/>
+ <gentext key="tip" text="TUYAU"/>
+ <gentext key="Table" text="Tableau"/>
+ <gentext key="table" text="Tableau"/>
+ <gentext key="Tip" text="Tuyau"/>
+ <gentext key="tip" text="Tuyau"/>
+ <gentext key="WARNING" text="AVERTISSEMENT"/>
+ <gentext key="warning" text="AVERTISSEMENT"/>
+ <gentext key="Warning" text="Avertissement"/>
+ <gentext key="warning" text="Avertissement"/>
+ <gentext key="appendix" text="annexe"/>
+ <gentext key="chapter" text="chapitre"/>
+ <gentext key="sidebar" text=""/>
+ <gentext key="section" text="section"/>
+ <gentext key="step" text="&#233;tape"/>
+ <gentext key="TableofContents" text="Table des mati&#232;res"/>
+ <gentext key="tableofcontents" text="Table des mati&#232;res"/>
+ <gentext key="in" text="dans"/>
+ <gentext key="by" text="par"/>
+ <gentext key="Edited" text="Publi&#233;"/>
+ <gentext key="edited" text="Publi&#233;"/>
+ <gentext key="Editedby" text="Publi&#233; par"/>
+ <gentext key="editedby" text="Publi&#233; par"/>
+ <gentext key="and" text="et"/>
+ <gentext key="Notes" text="Notes"/>
+ <gentext key="notes" text="Notes"/>
+ <gentext key="TableNotes" text="Remarques"/>
+ <gentext key="tablenotes" text="Remarques"/>
+ <gentext key="nonexistantelement" text="Cet &#233;l&#233;ment n'existe pas"/>
+ <gentext key="Pgs" text="Pages"/>
+ <gentext key="pgs" text="Pages"/>
+ <gentext key="unsupported" text="Non reconnu par le syst&#232;me"/>
+ <gentext key="xrefto" text="R&#233;f&#233;rence vers"/>
+ <gentext key="unexpectedelementname" text="Nom d'&#233;l&#233;ment non attendu"/>
+ <gentext key="Revisedby" text="Revu par&#160;: "/>
+ <gentext key="revisedby" text="Revu par&#160;: "/>
+ <gentext key="ListofTables" text="Liste des tableaux"/>
+ <gentext key="listoftables" text="Liste des tableaux"/>
+ <gentext key="ListofExamples" text="Liste des exemples"/>
+ <gentext key="listofexamples" text="Liste des exemples"/>
+ <gentext key="ListofFigures" text="Liste des illustrations"/>
+ <gentext key="listoffigures" text="Liste des illustrations"/>
+ <gentext key="ListofEquations" text="Liste des &#233;quations"/>
+ <gentext key="listofequations" text="Liste des &#233;quations"/>
+ <gentext key="ListofUnknown" text="Liste des inconnues"/>
+ <gentext key="listofunknown" text="Liste des inconnues"/>
+ <gentext key="nav-prev" text="Pr&#233;c&#233;dent"/>
+ <gentext key="nav-prev-sibling" text="Fast Backward"/>
+ <gentext key="nav-next-sibling" text="Fast Forward"/>
+ <gentext key="nav-next" text="Suivant"/>
+ <gentext key="nav-up" text="Niveau sup&#233;rieur"/>
+ <gentext key="nav-home" text="Sommaire"/>
+ <gentext key="sectioncalled" text="la section intitul&#233;e"/>
+ <gentext key="index symbols" text="Symboles"/>
+ <dingbat key="startquote" text="&#171;"/>
+ <dingbat key="endquote" text="&#187;"/>
+ <dingbat key="singlestartquote" text="&#8249;"/>
+ <dingbat key="singleendquote" text="&#8250;"/>
+ <dingbat key="nestedstartquote" text="&#171;"/>
+ <dingbat key="nestedendquote" text="&#187;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Liste des tableaux"/>
-<gentext key="ListofExamples" text="Liste des exemples"/>
-<gentext key="ListofFigures" text="Liste des illustrations"/>
-<gentext key="ListofEquations" text="Liste des &#x00E9;quations"/>
-<gentext key="ListofUnknown" text="Liste des inconnues"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Annexe %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Chapitre %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#201;quation %n. %t"/>
+ <template name="example" text="Exemple %n. %t"/>
+ <template name="figure" text="Figure %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Partie %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tableau %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Pr&#x00E9;c&#x00E9;dent"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Suivant"/>
-<gentext key="nav-up" text="Niveau sup&#x00E9;rieur"/>
-<gentext key="nav-home" text="Sommaire"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x00AB;"/>
-<dingbat key="endquote" text="&#x00BB;"/>
-<dingbat key="nestedstartquote" text="&#x00AB;"/>
-<dingbat key="nestedendquote" text="&#x00BB;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Annexe %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Chapitre %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exemple %n. %t"/>
+ <template name="figure" text="Figure %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Partie %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tableau %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="sect2" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="sect3" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="sect4" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="sect5" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="section" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ <template name="simplesect" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Section %n"/>
+ <template name="sect2" text="Section %n"/>
+ <template name="sect3" text="Section %n"/>
+ <template name="sect4" text="Section %n"/>
+ <template name="sect5" text="Section %n"/>
+ <template name="section" text="Section %n"/>
+ <template name="simplesect" text="la section intitul&#233;e &#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" et "/>
+ <template name="seplast" text=", et "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Voir "/>
+ <template name="seealso" text="Voir aussi "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Niveau: "/>
+ <template name="MsgOrig" text="Origine: "/>
+ <template name="MsgAud" text="Public vis&#233;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/gentext.xsl b/tests/docbook/common/gentext.xsl
new file mode 100644
index 00000000..ec3f9a3b
--- /dev/null
+++ b/tests/docbook/common/gentext.xsl
@@ -0,0 +1,385 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version='1.0'>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.title.template">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'title'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect"
+ mode="object.title.template">
+ <xsl:choose>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'section-title-numbered'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'section-title'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="article/appendix"
+ mode="object.title.template">
+ <!-- FIXME: HACK HACK HACK! -->
+ <xsl:text>%n. %t</xsl:text>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.subtitle.template">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'subtitle'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.xref.template">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'xref'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="section|simplesect
+ |sect1|sect2|sect3|sect4|sect5
+ |refsect1|refsect2|refsect3"
+ mode="object.xref.template">
+ <xsl:choose>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'section-xref-numbered'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'section-xref'"/>
+ <xsl:with-param name="name" select="local-name(.)"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.title.markup">
+ <xsl:variable name="template">
+ <xsl:apply-templates select="." mode="object.title.template"/>
+ </xsl:variable>
+
+<!--
+ <xsl:message>
+ <xsl:text>object.title.markup: </xsl:text>
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="$template"/>
+ </xsl:message>
+-->
+
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="1"/>
+ <xsl:with-param name="template" select="$template"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="*" mode="object.title.markup.textonly">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </xsl:variable>
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.subtitle.markup">
+ <xsl:variable name="template">
+ <xsl:apply-templates select="." mode="object.subtitle.template"/>
+ </xsl:variable>
+
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="template" select="$template"/>
+ </xsl:call-template>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="object.xref.markup">
+ <xsl:variable name="template">
+ <xsl:apply-templates select="." mode="object.xref.template"/>
+ </xsl:variable>
+
+<!--
+ <xsl:message>
+ <xsl:text>object.xref.markup: </xsl:text>
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="$template"/>
+ </xsl:message>
+-->
+
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="template" select="$template"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="section|simplesect
+ |sect1|sect2|sect3|sect4|sect5
+ |refsect1|refsect2|refsect3"
+ mode="object.xref.markup">
+ <xsl:variable name="template">
+ <xsl:apply-templates select="." mode="object.xref.template"/>
+ </xsl:variable>
+
+<!--
+ <xsl:message>
+ <xsl:text>object.xref.markup: </xsl:text>
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="$template"/>
+ </xsl:message>
+-->
+
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="template" select="$template"/>
+ </xsl:call-template>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template name="substitute-markup">
+ <xsl:param name="template" select="''"/>
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="bef-n" select="substring-before($template, '%n')"/>
+ <xsl:variable name="bef-s" select="substring-before($template, '%s')"/>
+ <xsl:variable name="bef-t" select="substring-before($template, '%t')"/>
+
+<!--
+ <xsl:message>
+ <xsl:text>sm: </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$allow-anchors"/>
+ </xsl:message>
+-->
+
+ <xsl:choose>
+ <!-- n=1 -->
+ <xsl:when test="starts-with($template, '%n')">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%n')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- t=1 -->
+ <xsl:when test="starts-with($template, '%t')">
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%t')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- s=1 -->
+ <xsl:when test="starts-with($template, '%s')">
+ <xsl:apply-templates select="." mode="subtitle.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%s')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- n and t and s -->
+ <xsl:when test="contains($template, '%n')
+ and contains($template, '%t')
+ and contains($template, '%s')">
+ <xsl:choose>
+ <!-- n is first -->
+ <xsl:when test="string-length($bef-n) &lt; string-length($bef-s)
+ and string-length($bef-n) &lt; string-length($bef-t)">
+ <xsl:value-of select="$bef-n"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%n')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <!-- s is first -->
+ <xsl:when test="string-length($bef-s) &lt; string-length($bef-n)
+ and string-length($bef-s) &lt; string-length($bef-t)">
+ <xsl:value-of select="$bef-s"/>
+ <xsl:apply-templates select="." mode="subtitle.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%s')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <!-- t must be first -->
+ <xsl:otherwise>
+ <xsl:value-of select="$bef-t"/>
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%t')"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <!-- n and t -->
+ <xsl:when test="contains($template, '%n')
+ and contains($template, '%t')">
+ <xsl:choose>
+ <!-- n is first -->
+ <xsl:when test="string-length($bef-n) &lt; string-length($bef-t)">
+ <xsl:value-of select="$bef-n"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%n')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <!-- t is first -->
+ <xsl:otherwise>
+ <xsl:value-of select="$bef-t"/>
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%t')"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <!-- n and s -->
+ <xsl:when test="contains($template, '%n')
+ and contains($template, '%s')">
+ <xsl:choose>
+ <!-- n is first -->
+ <xsl:when test="string-length($bef-n) &lt; string-length($bef-s)">
+ <xsl:value-of select="$bef-n"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%n')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <!-- s is first -->
+ <xsl:otherwise>
+ <xsl:value-of select="$bef-s"/>
+ <xsl:apply-templates select="." mode="subtitle.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%s')"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <!-- t and s -->
+ <xsl:when test="contains($template, '%t')
+ and contains($template, '%s')">
+ <xsl:choose>
+ <!-- t is first -->
+ <xsl:when test="string-length($bef-t) &lt; string-length($bef-s)">
+ <xsl:value-of select="$bef-t"/>
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%t')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <!-- s is first -->
+ <xsl:otherwise>
+ <xsl:value-of select="$bef-s"/>
+ <xsl:apply-templates select="." mode="subtitle.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%s')"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <!-- n -->
+ <xsl:when test="contains($template, '%n')">
+ <xsl:value-of select="$bef-n"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%n')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- t -->
+ <xsl:when test="contains($template, '%t')">
+ <xsl:value-of select="$bef-t"/>
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%t')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- s -->
+ <xsl:when test="contains($template, '%s')">
+ <xsl:value-of select="$bef-s"/>
+ <xsl:apply-templates select="." mode="subtitle.markup"/>
+ <xsl:call-template name="substitute-markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="template"
+ select="substring-after($template, '%s')"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- neither n nor t nor s -->
+ <xsl:otherwise>
+ <xsl:value-of select="$template"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+</xsl:stylesheet>
+
diff --git a/tests/docbook/common/hu.xml b/tests/docbook/common/hu.xml
index d37e06ff..6a86c6d7 100644
--- a/tests/docbook/common/hu.xml
+++ b/tests/docbook/common/hu.xml
@@ -1,94 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="hu">
-<gentext key="abstract" text="Kivonat"/>
-<gentext key="answer" text="V:"/>
-<gentext key="appendix" text="F&#x0171;ggel&#x00E9;k"/>
-<gentext key="article" text="Cikk"/>
-<gentext key="bibliography" text="Irodalomjegyz&#x00E9;k"/>
-<gentext key="book" text="K&#x0151;nyv"/>
-<gentext key="caution" text="Figyelem"/>
-<gentext key="chapter" text="Fejezet"/>
-<gentext key="colophon" text="V&#x00E9;gsz&#x00F3;"/>
-<gentext key="copyright" text="V&#x08e9;djegy"/>
-<gentext key="dedication" text="Aj&#x00E1;nl&#x00E1;s"/>
-<gentext key="edition" text="Kiad&#x00E1;s"/>
-<gentext key="equation" text="Egyenlet"/>
-<gentext key="example" text="P&#x00E9;lda"/>
-<gentext key="figure" text="&#x00C1;bra"/>
-<gentext key="glosssee" text="L&#x00E1;sd"/>
-<gentext key="glossseealso" text="L&#x00E1;sd m&#x00E9;g"/>
-<gentext key="glossary" text="Sz&#x00F3;jegyz&#x00E9;k"/>
-<gentext key="important" text="FONTOS"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Fontos"/>
-<gentext key="index" text="T&#x00E1;rgymutat&#x00F3;"/>
-<gentext key="legalnotice" text="Jogi k&#x0151;zlem&#x00E9;ny"/>
-<gentext key="msgaud" text="C&#x00E9;lk&#x0151;z&#x0151;ns&#x00E9;g"/>
-<gentext key="msglevel" text="Szint"/>
-<gentext key="msgorig" text="Eredet"/>
-<gentext key="note" text="Megjegyz&#x00E9;s"/>
-<gentext key="part" text="R&#x00E9;sz"/>
-<gentext key="preface" text="El&#x0151;sz&#x00F3;"/>
-<gentext key="procedure" text="Elj&#x00E1;r&#x00E1;s"/>
-<gentext key="published" text="Megjelent"/>
-<gentext key="question" text="K:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Referencia"/>
-<gentext key="refname" text="N&#x00E9;v"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="&#x00C1;ttekint&#x00E9;s"/>
-<gentext key="revision" text="Verzi&#x00F3;"/>
-<gentext key="revhistory" text="Verzi&#x00F3;k t&#x0151;rt&#x00E9;nete"/>
-<gentext key="section" text="Szakasz"/>
-<gentext key="see" text="L&#x00E1;sd"/>
-<gentext key="seealso" text="L&#x00E1;sd m&#x00E9;g"/>
-<gentext key="set" text="Set"/> <!-- en -->
-<gentext key="setindex" text="Set Index"/> <!-- en -->
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="L&#x00E9;p&#x00E9;s"/>
-<gentext key="table" text="T&#x00E1;bl&#x00E1;zat"/>
-<gentext key="tip" text="Tipp"/>
-<gentext key="warning" text="Figyelem"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Tartalom"/>
-<gentext key="in" text=""/>
-<gentext key="by" text=""/>
-<gentext key="Edited" text="Szerk."/>
-<gentext key="Editedby" text="Szerkesztette"/>
-<gentext key="and" text="&#x00E9;s"/>
-<gentext key="Notes" text="Megjegyz&#x00E9;sek"/>
-<gentext key="TableNotes" text="Megjegyz&#x00E9;sek"/>
-<gentext key="nonexistantelement" text="nem l&#x00E9;tezo elem"/>
-<gentext key="Pgs" text="Lsz."/>
-<gentext key="unsupported" text="nem t&#x00E1;mogatott"/>
-<gentext key="xrefto" text="keresztref:"/>
-<gentext key="unexpectedelementname" text="Nem v&#x00E1;rt elemn&#x00E9;v"/>
-<gentext key="Revisedby" text="Megvizsg&#x00E1;lva: "/>
+ <gentext key="Abstract" text="Kivonat"/>
+ <gentext key="abstract" text="kivonat"/>
+ <gentext key="Answer" text="V&#225;lasz"/>
+ <gentext key="answer" text="v&#225;lasz"/>
+ <gentext key="Appendix" text="F&#252;ggel&#233;k"/>
+ <gentext key="Article" text="Cikk"/>
+ <gentext key="article" text="cikk"/>
+ <gentext key="Bibliography" text="Irodalomjegyz&#233;k"/>
+ <gentext key="bibliography" text="irodalomjegyz&#233;k"/>
+ <gentext key="Book" text="K&#246;nyv"/>
+ <gentext key="book" text="k&#246;nyv"/>
+ <gentext key="CAUTION" text="FIGYELEM"/>
+ <gentext key="caution" text="figyelem"/>
+ <gentext key="Caution" text="Figyelem"/>
+ <gentext key="caution" text="figyelem"/>
+ <gentext key="Chapter" text="Fejezet"/>
+ <gentext key="Colophon" text="V&#233;gsz&#243;"/>
+ <gentext key="colophon" text="v&#233;gsz&#243;"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="copyright"/>
+ <gentext key="Dedication" text="Aj&#225;nl&#225;s"/>
+ <gentext key="dedication" text="aj&#225;nl&#225;s"/>
+ <gentext key="Edition" text="Kiad&#225;s"/>
+ <gentext key="edition" text="kiad&#225;s"/>
+ <gentext key="Equation" text="Egyenlet"/>
+ <gentext key="equation" text="egyenlet"/>
+ <gentext key="Example" text="P&#233;lda"/>
+ <gentext key="example" text="p&#233;lda"/>
+ <gentext key="Figure" text="&#193;bra"/>
+ <gentext key="figure" text="&#225;bra"/>
+ <gentext key="GlossSee" text="L&#225;sd"/>
+ <gentext key="glosssee" text="l&#225;sd"/>
+ <gentext key="GlossSeeAlso" text="L&#225;sd m&#233;g"/>
+ <gentext key="glossseealso" text="l&#225;sd m&#233;g"/>
+ <gentext key="Glossary" text="Sz&#243;jegyz&#233;k"/>
+ <gentext key="glossary" text="sz&#243;jegyz&#233;k"/>
+ <gentext key="IMPORTANT" text="FONTOS"/>
+ <gentext key="important" text="fontos"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="isbn"/>
+ <gentext key="Important" text="Fontos"/>
+ <gentext key="important" text="fontos"/>
+ <gentext key="Index" text="T&#225;rgymutat&#243;"/>
+ <gentext key="index" text="t&#225;rgymutat&#243;"/>
+ <gentext key="LegalNotice" text="Jogi k&#246;zlem&#233;ny"/>
+ <gentext key="legalnotice" text="jogi k&#246;zlem&#233;ny"/>
+ <gentext key="MsgAud" text="C&#233;lk&#246;z&#246;ns&#233;g"/>
+ <gentext key="msgaud" text="c&#233;lk&#246;z&#246;ns&#233;g"/>
+ <gentext key="MsgLevel" text="Szint"/>
+ <gentext key="msglevel" text="szint"/>
+ <gentext key="MsgOrig" text="Eredet"/>
+ <gentext key="msgorig" text="eredet"/>
+ <gentext key="NOTE" text="MEGJEGYZ&#201;S"/>
+ <gentext key="note" text="megjegyz&#233;s"/>
+ <gentext key="Note" text="Megjegyz&#233;s"/>
+ <gentext key="note" text="megjegyz&#233;s"/>
+ <gentext key="Part" text="R&#233;sz"/>
+ <gentext key="part" text="r&#233;sz"/>
+ <gentext key="Preface" text="El&#336;sz&#243;"/>
+ <gentext key="preface" text="el&#336;sz&#243;"/>
+ <gentext key="Procedure" text="Elj&#225;r&#225;s"/>
+ <gentext key="procedure" text="elj&#225;r&#225;s"/>
+ <gentext key="Published" text="Megjelent"/>
+ <gentext key="published" text="megjelent"/>
+ <gentext key="Question" text="K&#233;rd&#233;s"/>
+ <gentext key="question" text="k&#233;rd&#233;s"/>
+ <gentext key="RefEntry" text="Bejegyz&#233;s"/>
+ <gentext key="refentry" text="bejegyz&#233;s"/>
+ <gentext key="RefName" text="N&#233;v"/>
+ <gentext key="refname" text="n&#233;v"/>
+ <gentext key="Reference" text="Referencia"/>
+ <gentext key="reference" text="referencia"/>
+ <gentext key="RefSection" text="Szakasz"/>
+ <gentext key="refsection" text="szakasz"/>
+ <gentext key="RefSynopsisDiv" text="&#193;ttekint&#233;s"/>
+ <gentext key="refsynopsisdiv" text="&#225;ttekint&#233;s"/>
+ <gentext key="Revision" text="Verzi&#243;"/>
+ <gentext key="revision" text="verzi&#243;"/>
+ <gentext key="RevHistory" text="Verzi&#243;t&#246;rt&#233;net"/>
+ <gentext key="revhistory" text="verzi&#243;t&#246;rt&#233;net"/>
+ <gentext key="Section" text="Szakasz"/>
+ <gentext key="See" text="L&#225;sd"/>
+ <gentext key="see" text="l&#225;sd"/>
+ <gentext key="SeeAlso" text="L&#225;sd m&#233;g"/>
+ <gentext key="seealso" text="l&#225;sd m&#233;g"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text="Sz&#233;ljegyzet"/>
+ <gentext key="Step" text="L&#233;p&#233;s"/>
+ <gentext key="TIP" text="TIPP"/>
+ <gentext key="tip" text="tipp"/>
+ <gentext key="Table" text="T&#225;bl&#225;zat"/>
+ <gentext key="table" text="t&#225;bl&#225;zat"/>
+ <gentext key="Tip" text="Tipp"/>
+ <gentext key="tip" text="tipp"/>
+ <gentext key="WARNING" text="FIGYELEM"/>
+ <gentext key="warning" text="figyelem"/>
+ <gentext key="Warning" text="Figyelem"/>
+ <gentext key="warning" text="figyelem"/>
+ <gentext key="appendix" text="f&#252;ggel&#233;k"/>
+ <gentext key="chapter" text="fejezet"/>
+ <gentext key="section" text="szakasz"/>
+ <gentext key="sidebar" text="sz&#233;ljegyzet"/>
+ <gentext key="step" text="l&#233;p&#233;s"/>
+ <gentext key="Seealso" text="L&#225;sd m&#233;g"/>
+ <gentext key="seealso" text="l&#225;sd m&#233;g"/>
+ <gentext key="TableofContents" text="Tartalom"/>
+ <gentext key="tableofcontents" text="tartalom"/>
+ <gentext key="in" text=""/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="Szerk."/>
+ <gentext key="edited" text="szerk."/>
+ <gentext key="Editedby" text="Szerkesztette"/>
+ <gentext key="editedby" text="szerkesztette"/>
+ <gentext key="and" text="&#233;s"/>
+ <gentext key="Notes" text="Megjegyz&#233;sek"/>
+ <gentext key="notes" text="megjegyz&#233;sek"/>
+ <gentext key="TableNotes" text="Megjegyz&#233;sek"/>
+ <gentext key="tablenotes" text="megjegyz&#233;sek"/>
+ <gentext key="nonexistantelement" text="nem l&#233;tez&#336; elem"/>
+ <gentext key="Pgs" text="Lsz."/>
+ <gentext key="pgs" text="lsz."/>
+ <gentext key="unsupported" text="nem t&#225;mogatott"/>
+ <gentext key="xrefto" text="keresztref"/>
+ <gentext key="unexpectedelementname" text="nem v&#225;rt elemn&#233;v"/>
+ <gentext key="Revisedby" text="Megvizsg&#225;lva"/>
+ <gentext key="revisedby" text="megvizsg&#225;lva"/>
+ <gentext key="ListofTables" text="A t&#225;bl&#225;zatok list&#225;ja"/>
+ <gentext key="listoftables" text="a t&#225;bl&#225;zatok list&#225;ja"/>
+ <gentext key="ListofExamples" text="A p&#233;ld&#225;k list&#225;ja"/>
+ <gentext key="listofexamples" text="a p&#233;ld&#225;k list&#225;ja"/>
+ <gentext key="ListofFigures" text="Az &#225;br&#225;k list&#225;ja"/>
+ <gentext key="listoffigures" text="az &#225;br&#225;k list&#225;ja"/>
+ <gentext key="ListofEquations" text="Az egyenletek list&#225;ja"/>
+ <gentext key="listofequations" text="az egyenletek list&#225;ja"/>
+ <gentext key="ListofUnknown" text="Az egy&#233;b elemek list&#225;ja"/>
+ <gentext key="listofunknown" text="az egy&#233;b elemek list&#225;ja"/>
+ <gentext key="nav-prev" text="El&#336;z&#336;"/>
+ <gentext key="nav-prev-sibling" text="Gyors vissza"/>
+ <gentext key="nav-next-sibling" text="Gyors el&#336;re"/>
+ <gentext key="nav-next" text="K&#246;vetkez&#336;"/>
+ <gentext key="nav-up" text="Fel"/>
+ <gentext key="nav-home" text="Tartalom"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="T&#x00E1;bl&#x00E1;zatok list&#x00E1;ja"/>
-<gentext key="ListofExamples" text="P&#x00E9;ld&#x00E1;k list&#x00E1;ja"/>
-<gentext key="ListofFigures" text="&#x00C1;br&#x00E1;k list&#x00E1;ja"/>
-<gentext key="ListofEquations" text="Egyenletek list&#x00E1;ja"/>
-<gentext key="ListofUnknown" text="Egy&#x00E9;b elemek list&#x00E1;ja"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="F&#252;ggel&#233;k %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Fejezet %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Egyenlet %n. %t"/>
+ <template name="example" text="P&#233;lda %n. %t"/>
+ <template name="figure" text="&#193;bra %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="R&#233;sz %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="T&#225;bl&#225;zat %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Vissza"/>
-<gentext key="nav-prev-sibling" text="Gyors vissza"/>
-<gentext key="nav-next-sibling" text="Gyors Tov&#x00E1;bb"/>
-<gentext key="nav-next" text="Tov&#x00E1;bb"/>
-<gentext key="nav-up" text="Fel"/>
-<gentext key="nav-home" text="Tartalom"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%n %g %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="F&#252;ggel&#233;k %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Fejezet %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="P&#233;lda %n. %t"/>
+ <template name="figure" text="&#193;bra %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="R&#233;sz %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="T&#225;bl&#225;zat %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Szakasz %n"/>
+ <template name="sect2" text="Szakasz %n"/>
+ <template name="sect3" text="Szakasz %n"/>
+ <template name="sect4" text="Szakasz %n"/>
+ <template name="sect5" text="Szakasz %n"/>
+ <template name="section" text="Szakasz %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#233;s "/>
+ <template name="seplast" text=", &#233;s "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="L&#225;sd "/>
+ <template name="seealso" text="L&#225;sd m&#233;g "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Szint: "/>
+ <template name="MsgOrig" text="Eredet: "/>
+ <template name="MsgAud" text="C&#233;lk&#246;z&#246;ns&#233;g: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/id.xml b/tests/docbook/common/id.xml
index f85b0215..cd440a84 100644
--- a/tests/docbook/common/id.xml
+++ b/tests/docbook/common/id.xml
@@ -1,104 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="id">
-<gentext key="abstract" text="Abstrak"/>
-<gentext key="answer" text="Jawab:"/>
-<gentext key="appendix" text="Lampiran"/>
-<gentext key="article" text="Artikel"/>
-<gentext key="bibliography" text="Bibliografi"/>
-<gentext key="book" text="Buku"/>
-<gentext key="caution" text="PERHATIAN"/>
-<gentext key="caution" text="Perhatian"/>
-<gentext key="chapter" text="Bab"/>
-<gentext key="colophon" text="Kolofon"/>
-<gentext key="copyright" text="Hak Cipta"/>
-<gentext key="dedication" text="Dedikasi"/>
-<gentext key="edition" text="Edisi"/>
-<gentext key="equation" text="Persamaan"/>
-<gentext key="example" text="Teladan"/>
-<gentext key="figure" text="Gambar"/>
-<gentext key="glosssee" text="Lihat"/>
-<gentext key="glossseealso" text="Lihat Juga"/>
-<gentext key="glossary" text="Daftar Istilah"/>
-<gentext key="important" text="PENTING"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Penting"/>
-<gentext key="index" text="Indeks"/>
-<gentext key="legalnotice" text="Aspek Hukum"/>
-<gentext key="msgaud" text="Pemirsa"/>
-<gentext key="msglevel" text="Tingkatan"/>
-<gentext key="msgorig" text="Asal"/>
-<gentext key="note" text="CATATAN"/>
-<gentext key="note" text="Catatan"/>
-<gentext key="part" text="Bagian"/>
-<gentext key="preface" text="Kata Pengantar"/>
-<gentext key="procedure" text="Prosedur"/>
-<gentext key="published" text="Diterbitkan"/>
-<gentext key="question" text="Tanya:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Referensi"/>
-<gentext key="refname" text="Nama"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="Sinopsis"/>
-<gentext key="revision" text="Revisi"/>
-<gentext key="revhistory" text="Catatan Revisi"/>
-<gentext key="section" text="Bagian"/>
-<gentext key="see" text="Lihat"/>
-<gentext key="seealso" text="Lihat Juga"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Tahap"/>
-<gentext key="tip" text="TIP"/>
-<gentext key="table" text="Tabel"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="AWAS"/>
-<gentext key="warning" text="Awas"/>
-<gentext key="appendix" text="lampiran"/>
-<gentext key="chapter" text="bab"/>
-<gentext key="section" text="bagian"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="step" text="tahap"/>
-<gentext key="seealso" text="Lihat juga"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Daftar Isi"/>
-<gentext key="in" text="di"/>
-<gentext key="by" text="oleh"/>
-<gentext key="Edited" text="disunting"/>
-<gentext key="Editedby" text="disunting oleh"/>
-<gentext key="and" text="dan"/>
-<gentext key="Notes" text="Catatan"/>
-<gentext key="TableNotes" text="Catatan"/>
-<gentext key="nonexistantelement" text="elemen tak tampak"/>
-<gentext key="Pgs" text="Hal."/>
-<gentext key="unsupported" text="tidak didukung"/>
-<gentext key="xrefto" text="xref ke"/>
-<gentext key="unexpectedelementname" text="Nama Elemen seharusnya tidak ada"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Abstrak"/>
+ <gentext key="abstract" text="Abstrak"/>
+ <gentext key="Answer" text="Jawab:"/>
+ <gentext key="answer" text="Jawab:"/>
+ <gentext key="Appendix" text="Lampiran"/>
+ <gentext key="Article" text="Artikel"/>
+ <gentext key="article" text="Artikel"/>
+ <gentext key="Bibliography" text="Bibliografi"/>
+ <gentext key="bibliography" text="Bibliografi"/>
+ <gentext key="Book" text="Buku"/>
+ <gentext key="book" text="Buku"/>
+ <gentext key="CAUTION" text="PERHATIAN"/>
+ <gentext key="caution" text="PERHATIAN"/>
+ <gentext key="Caution" text="Perhatian"/>
+ <gentext key="caution" text="Perhatian"/>
+ <gentext key="Chapter" text="Bab"/>
+ <gentext key="Colophon" text="Kolofon"/>
+ <gentext key="colophon" text="Kolofon"/>
+ <gentext key="Copyright" text="Hak Cipta"/>
+ <gentext key="copyright" text="Hak Cipta"/>
+ <gentext key="Dedication" text="Dedikasi"/>
+ <gentext key="dedication" text="Dedikasi"/>
+ <gentext key="Edition" text="Edisi"/>
+ <gentext key="edition" text="Edisi"/>
+ <gentext key="Equation" text="Persamaan"/>
+ <gentext key="equation" text="Persamaan"/>
+ <gentext key="Example" text="Teladan"/>
+ <gentext key="example" text="Teladan"/>
+ <gentext key="Figure" text="Gambar"/>
+ <gentext key="figure" text="Gambar"/>
+ <gentext key="GlossSee" text="Lihat"/>
+ <gentext key="glosssee" text="Lihat"/>
+ <gentext key="GlossSeeAlso" text="Lihat Juga"/>
+ <gentext key="glossseealso" text="Lihat Juga"/>
+ <gentext key="Glossary" text="Daftar Istilah"/>
+ <gentext key="glossary" text="Daftar Istilah"/>
+ <gentext key="IMPORTANT" text="PENTING"/>
+ <gentext key="important" text="PENTING"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Penting"/>
+ <gentext key="important" text="Penting"/>
+ <gentext key="Index" text="Indeks"/>
+ <gentext key="index" text="Indeks"/>
+ <gentext key="LegalNotice" text="Aspek Hukum"/>
+ <gentext key="legalnotice" text="Aspek Hukum"/>
+ <gentext key="MsgAud" text="Pemirsa"/>
+ <gentext key="msgaud" text="Pemirsa"/>
+ <gentext key="MsgLevel" text="Tingkatan"/>
+ <gentext key="msglevel" text="Tingkatan"/>
+ <gentext key="MsgOrig" text="Asal"/>
+ <gentext key="msgorig" text="Asal"/>
+ <gentext key="NOTE" text="CATATAN"/>
+ <gentext key="note" text="CATATAN"/>
+ <gentext key="Note" text="Catatan"/>
+ <gentext key="note" text="Catatan"/>
+ <gentext key="Part" text="Bagian"/>
+ <gentext key="part" text="Bagian"/>
+ <gentext key="Preface" text="Kata Pengantar"/>
+ <gentext key="preface" text="Kata Pengantar"/>
+ <gentext key="Procedure" text="Prosedur"/>
+ <gentext key="procedure" text="Prosedur"/>
+ <gentext key="Published" text="Diterbitkan"/>
+ <gentext key="published" text="Diterbitkan"/>
+ <gentext key="Question" text="Tanya:"/>
+ <gentext key="question" text="Tanya:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Referensi"/>
+ <gentext key="reference" text="Referensi"/>
+ <gentext key="RefName" text="Nama"/>
+ <gentext key="refname" text="Nama"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Sinopsis"/>
+ <gentext key="refsynopsisdiv" text="Sinopsis"/>
+ <gentext key="Revision" text="Revisi"/>
+ <gentext key="revision" text="Revisi"/>
+ <gentext key="RevHistory" text="Catatan Revisi"/>
+ <gentext key="revhistory" text="Catatan Revisi"/>
+ <gentext key="Section" text="Bagian"/>
+ <gentext key="See" text="Lihat"/>
+ <gentext key="see" text="Lihat"/>
+ <gentext key="SeeAlso" text="Lihat Juga"/>
+ <gentext key="seealso" text="Lihat Juga"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Tahap"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="tip" text="TIP"/>
+ <gentext key="Table" text="Tabel"/>
+ <gentext key="table" text="Tabel"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="AWAS"/>
+ <gentext key="warning" text="AWAS"/>
+ <gentext key="Warning" text="Awas"/>
+ <gentext key="warning" text="Awas"/>
+ <gentext key="appendix" text="lampiran"/>
+ <gentext key="chapter" text="bab"/>
+ <gentext key="section" text="bagian"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="step" text="tahap"/>
+ <gentext key="Seealso" text="Lihat juga"/>
+ <gentext key="seealso" text="Lihat juga"/>
+ <gentext key="TableofContents" text="Daftar Isi"/>
+ <gentext key="tableofcontents" text="Daftar Isi"/>
+ <gentext key="in" text="di"/>
+ <gentext key="by" text="oleh"/>
+ <gentext key="Edited" text="disunting"/>
+ <gentext key="edited" text="disunting"/>
+ <gentext key="Editedby" text="disunting oleh"/>
+ <gentext key="editedby" text="disunting oleh"/>
+ <gentext key="and" text="dan"/>
+ <gentext key="Notes" text="Catatan"/>
+ <gentext key="notes" text="Catatan"/>
+ <gentext key="TableNotes" text="Catatan"/>
+ <gentext key="tablenotes" text="Catatan"/>
+ <gentext key="nonexistantelement" text="elemen tak tampak"/>
+ <gentext key="Pgs" text="Hal."/>
+ <gentext key="pgs" text="Hal."/>
+ <gentext key="unsupported" text="tidak didukung"/>
+ <gentext key="xrefto" text="xref ke"/>
+ <gentext key="unexpectedelementname" text="Nama Elemen seharusnya tidak ada"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Daftar Tabel"/>
+ <gentext key="listoftables" text="Daftar Tabel"/>
+ <gentext key="ListofExamples" text="Daftar Teladan"/>
+ <gentext key="listofexamples" text="Daftar Teladan"/>
+ <gentext key="ListofFigures" text="Daftar Gambar"/>
+ <gentext key="listoffigures" text="Daftar Gambar"/>
+ <gentext key="ListofEquations" text="Daftar Persamaan"/>
+ <gentext key="listofequations" text="Daftar Persamaan"/>
+ <gentext key="ListofUnknown" text="Daftar Gaib"/>
+ <gentext key="listofunknown" text="Daftar Gaib"/>
+ <gentext key="nav-prev" text="Prev"/>
+ <gentext key="nav-prev-sibling" text="Fast Backward"/>
+ <gentext key="nav-next-sibling" text="Fast Forward"/>
+ <gentext key="nav-next" text="Next"/>
+ <gentext key="nav-up" text="Up"/>
+ <gentext key="nav-home" text="Home"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Daftar Tabel"/>
-<gentext key="ListofExamples" text="Daftar Teladan"/>
-<gentext key="ListofFigures" text="Daftar Gambar"/>
-<gentext key="ListofEquations" text="Daftar Persamaan"/>
-<gentext key="ListofUnknown" text="Daftar Gaib"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Lampiran %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Bab %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Persamaan %n. %t"/>
+ <template name="example" text="Teladan %n. %t"/>
+ <template name="figure" text="Gambar %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Bagian %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Prev"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Lampiran %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Bab %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Teladan %n. %t"/>
+ <template name="figure" text="Gambar %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Bagian %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Bagian %n"/>
+ <template name="sect2" text="Bagian %n"/>
+ <template name="sect3" text="Bagian %n"/>
+ <template name="sect4" text="Bagian %n"/>
+ <template name="sect5" text="Bagian %n"/>
+ <template name="section" text="Bagian %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" dan "/>
+ <template name="seplast" text=", dan "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Lihat "/>
+ <template name="seealso" text="Lihat Juga "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Tingkatan: "/>
+ <template name="MsgOrig" text="Asal: "/>
+ <template name="MsgAud" text="Pemirsa: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/it.xml b/tests/docbook/common/it.xml
index a7e1063e..ce50b116 100644
--- a/tests/docbook/common/it.xml
+++ b/tests/docbook/common/it.xml
@@ -1,103 +1,349 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="it">
-<!-- updates from camille@mandrakesoft.com -->
-<gentext key="abstract" text="Estratto"/>
-<gentext key="appendix" text="Appendice"/>
-<gentext key="article" text="Articolo"/>
-<gentext key="audience" text="Pubblico"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Libro"/>
-<gentext key="caution" text="CAUTELA"/>
-<gentext key="caution" text="Cautela"/>
-<gentext key="chapter" text="Capitolo"/>
-<gentext key="colophon" text="Colophon"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedica"/>
-<gentext key="edition" text="Edizione"/>
-<gentext key="equation" text="Equazione"/>
-<gentext key="example" text="Esempio"/>
-<gentext key="figure" text="Figura"/>
-<gentext key="glossary" text="Glossario"/>
-<gentext key="glosssee" text="Vedi"/>
-<gentext key="glossseealso" text="Vedi anche"/>
-<gentext key="important" text="IMPORTANTE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Importante"/>
-<gentext key="index" text="Indice"/>
-<gentext key="legalnotice" text="Note legali"/>
-<gentext key="level" text="Livello"/>
-<gentext key="note" text="NOTA"/>
-<gentext key="name" text="Nome"/>
-<gentext key="note" text="Nota"/>
-<gentext key="origin" text="Origine"/>
-<gentext key="part" text="Parte"/>
-<gentext key="preface" text="Prefazione"/>
-<gentext key="procedure" text="Procedura"/>
-<gentext key="published" text="Pubblicato"/>
-<gentext key="reference" text="Riferimento"/>
-<gentext key="revision" text="Revisione"/>
-<gentext key="history" text="Diario"/>
-<gentext key="refsynopsisdiv" text="Sinossi"/>
-<gentext key="revisionhistory" text="Diario delle revisioni"/>
-<gentext key="section" text="Sezione"/>
-<gentext key="see" text="Vd."/>
-<gentext key="seealso" text="Vd. Anche"/>
-<gentext key="seealso" text="Vd. anche"/>
-<gentext key="set" text="Raccolta"/>
-<gentext key="setindex" text="Indice Raccolta"/>
-<gentext key="sidebar" text="Nota a margine"/>
-<gentext key="step" text="Passaggio"/>
-<gentext key="tip" text="SUGGERIMENTO"/>
-<gentext key="table" text="Tabella"/>
-<gentext key="tip" text="Suggerimento"/>
-<gentext key="warning" text="ATTENZIONE"/>
-<gentext key="warning" text="Attenzione"/>
-<gentext key="appendix" text="appendice"/>
-<gentext key="chapter" text="capitolo"/>
-<gentext key="section" text="sezione"/>
-<gentext key="step" text="passaggio"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Sommario"/>
-<gentext key="called" text="intitolato"/>
-<gentext key="in" text="in"/>
-<gentext key="by" text="di"/>
-<gentext key="Edited" text="A cura"/>
-<gentext key="Editedby" text="A cura di"/>
-<gentext key="and" text="e"/>
-<gentext key="Notes" text="Note"/>
-<gentext key="TableNotes" text="Note"/>
-<gentext key="nonexistantelement" text="elemento non esistente"/>
-<gentext key="the" text="il"/>
-<gentext key="Pgs" text="pp."/>
-<gentext key="unsupported" text="non supportato"/>
-<gentext key="xrefto" text="riferimento a"/>
-<gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
-<gentext key="Revisedby" text="Modificato da:"/>
+ <gentext key="Abstract" text="Estratto"/>
+ <gentext key="abstract" text="Estratto"/>
+ <gentext key="Answer" text="R:"/>
+ <gentext key="answer" text="R:"/>
+ <gentext key="Appendix" text="Appendice"/>
+ <gentext key="Article" text="Articolo"/>
+ <gentext key="article" text="Articolo"/>
+ <gentext key="Audience" text="Pubblico"/>
+ <gentext key="audience" text="Pubblico"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Libro"/>
+ <gentext key="book" text="Libro"/>
+ <gentext key="CAUTION" text="CAUTELA"/>
+ <gentext key="caution" text="CAUTELA"/>
+ <gentext key="Caution" text="Cautela"/>
+ <gentext key="caution" text="Cautela"/>
+ <gentext key="Chapter" text="Capitolo"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedica"/>
+ <gentext key="dedication" text="Dedica"/>
+ <gentext key="Edition" text="Edizione"/>
+ <gentext key="edition" text="Edizione"/>
+ <gentext key="Equation" text="Equazione"/>
+ <gentext key="equation" text="Equazione"/>
+ <gentext key="Example" text="Esempio"/>
+ <gentext key="example" text="Esempio"/>
+ <gentext key="Figure" text="Figura"/>
+ <gentext key="figure" text="Figura"/>
+ <gentext key="GlossSee" text="Vedi"/>
+ <gentext key="glosssee" text="Vedi"/>
+ <gentext key="GlossSeeAlso" text="Vedi anche"/>
+ <gentext key="glossseealso" text="Vedi anche"/>
+ <gentext key="Glossary" text="Glossario"/>
+ <gentext key="glossary" text="Glossario"/>
+ <gentext key="IMPORTANT" text="IMPORTANTE"/>
+ <gentext key="important" text="IMPORTANTE"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Importante"/>
+ <gentext key="important" text="Importante"/>
+ <gentext key="Index" text="Indice"/>
+ <gentext key="index" text="Indice"/>
+ <gentext key="LegalNotice" text="Note legali"/>
+ <gentext key="legalnotice" text="Note legali"/>
+ <gentext key="Level" text="Livello"/>
+ <gentext key="level" text="Livello"/>
+ <gentext key="MsgAud" text="Pubblico"/>
+ <gentext key="msgaud" text="Pubblico"/>
+ <gentext key="MsgLevel" text="Livello"/>
+ <gentext key="msglevel" text="Livello"/>
+ <gentext key="MsgOrig" text="Origine"/>
+ <gentext key="msgorig" text="Origine"/>
+ <gentext key="NOTE" text="NOTA"/>
+ <gentext key="note" text="NOTA"/>
+ <gentext key="Name" text="Nome"/>
+ <gentext key="name" text="Nome"/>
+ <gentext key="Note" text="Nota"/>
+ <gentext key="note" text="Nota"/>
+ <gentext key="Origin" text="Origine"/>
+ <gentext key="origin" text="Origine"/>
+ <gentext key="Part" text="Parte"/>
+ <gentext key="part" text="Parte"/>
+ <gentext key="Preface" text="Prefazione"/>
+ <gentext key="preface" text="Prefazione"/>
+ <gentext key="Procedure" text="Procedura"/>
+ <gentext key="procedure" text="Procedura"/>
+ <gentext key="Published" text="Pubblicato"/>
+ <gentext key="published" text="Pubblicato"/>
+ <gentext key="Question" text="D:"/>
+ <gentext key="question" text="D:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Riferimento"/>
+ <gentext key="reference" text="Riferimento"/>
+ <gentext key="RefName" text="Nome"/>
+ <gentext key="refname" text="Nome"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Sinossi"/>
+ <gentext key="refsynopsisdiv" text="Sinossi"/>
+ <gentext key="Revision" text="Revisione"/>
+ <gentext key="revision" text="Revisione"/>
+ <gentext key="RevHistory" text="Diario delle revisioni"/>
+ <gentext key="revhistory" text="Diario delle revisioni"/>
+ <gentext key="History" text="Diario"/>
+ <gentext key="history" text="Diario"/>
+ <gentext key="Section" text="Sezione"/>
+ <gentext key="See" text="Vd."/>
+ <gentext key="see" text="Vd."/>
+ <gentext key="SeeAlso" text="Vd. Anche"/>
+ <gentext key="seealso" text="Vd. Anche"/>
+ <gentext key="Seealso" text="Vd. anche"/>
+ <gentext key="seealso" text="Vd. anche"/>
+ <gentext key="Set" text="Raccolta"/>
+ <gentext key="set" text="Raccolta"/>
+ <gentext key="SetIndex" text="Indice Raccolta"/>
+ <gentext key="setindex" text="Indice Raccolta"/>
+ <gentext key="Sidebar" text="Nota a margine"/>
+ <gentext key="sidebar" text="nota a margine"/>
+ <gentext key="Step" text="Passaggio"/>
+ <gentext key="TIP" text="SUGGERIMENTO"/>
+ <gentext key="tip" text="SUGGERIMENTO"/>
+ <gentext key="Table" text="Tabella"/>
+ <gentext key="table" text="Tabella"/>
+ <gentext key="Tip" text="Suggerimento"/>
+ <gentext key="tip" text="Suggerimento"/>
+ <gentext key="WARNING" text="ATTENZIONE"/>
+ <gentext key="warning" text="ATTENZIONE"/>
+ <gentext key="Warning" text="Attenzione"/>
+ <gentext key="warning" text="Attenzione"/>
+ <gentext key="appendix" text="appendice"/>
+ <gentext key="chapter" text="capitolo"/>
+ <gentext key="section" text="sezione"/>
+ <gentext key="step" text="passaggio"/>
+ <gentext key="TableofContents" text="Sommario"/>
+ <gentext key="tableofcontents" text="Sommario"/>
+ <gentext key="called" text="intitolato"/>
+ <gentext key="in" text="in"/>
+ <gentext key="by" text="di"/>
+ <gentext key="Edited" text="A cura"/>
+ <gentext key="edited" text="A cura"/>
+ <gentext key="Editedby" text="A cura di"/>
+ <gentext key="editedby" text="A cura di"/>
+ <gentext key="and" text="e"/>
+ <gentext key="Notes" text="Note"/>
+ <gentext key="notes" text="Note"/>
+ <gentext key="TableNotes" text="Note"/>
+ <gentext key="tablenotes" text="Note"/>
+ <gentext key="nonexistantelement" text="elemento non esistente"/>
+ <gentext key="the" text="il"/>
+ <gentext key="Pgs" text="pp."/>
+ <gentext key="pgs" text="pp."/>
+ <gentext key="unsupported" text="non supportato"/>
+ <gentext key="xrefto" text="riferimento a"/>
+ <gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
+ <gentext key="Revisedby" text="Corretto da: "/>
+ <gentext key="revisedby" text="Corretto da: "/>
+ <gentext key="ListofTables" text="Lista delle Tabelle"/>
+ <gentext key="listoftables" text="Lista delle Tabelle"/>
+ <gentext key="ListofExamples" text="Lista degli Esempi"/>
+ <gentext key="listofexamples" text="Lista degli Esempi"/>
+ <gentext key="ListofFigures" text="Lista delle Figure"/>
+ <gentext key="listoffigures" text="Lista delle Figure"/>
+ <gentext key="ListofEquations" text="Lista delle Equazioni"/>
+ <gentext key="listofequations" text="Lista delle Equazioni"/>
+ <gentext key="ListofUnknown" text="Lista Sconosciuti"/>
+ <gentext key="listofunknown" text="Lista Sconosciuti"/>
+ <gentext key="nav-prev" text="Indietro"/>
+ <gentext key="nav-prev-sibling" text="Salta indietro"/>
+ <gentext key="nav-next-sibling" text="Salta avanti"/>
+ <gentext key="nav-next" text="Avanti"/>
+ <gentext key="nav-up" text="Risali"/>
+ <gentext key="nav-home" text="Partenza"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Lista delle Tabelle"/>
-<gentext key="ListofExamples" text="Lista degli Esempi"/>
-<gentext key="ListofFigures" text="Lista delle Figure"/>
-<gentext key="ListofEquations" text="Lista delle Equazioni"/>
-<gentext key="ListofUnknown" text="Lista Sconosciuti"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Appendice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Capitolo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Equazione %n. %t"/>
+ <template name="example" text="Esempio %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabella %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Indietro"/>
-<gentext key="nav-prev-sibling" text="Salta indietro"/>
-<gentext key="nav-next-sibling" text="Salta avanti"/>
-<gentext key="nav-next" text="Avanti"/>
-<gentext key="nav-up" text="Risali"/>
-<gentext key="nav-home" text="Partenza"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Appendice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Capitolo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Esempio %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabella %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Sezione %n"/>
+ <template name="sect2" text="Sezione %n"/>
+ <template name="sect3" text="Sezione %n"/>
+ <template name="sect4" text="Sezione %n"/>
+ <template name="sect5" text="Sezione %n"/>
+ <template name="section" text="Sezione %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" e "/>
+ <template name="seplast" text=", e "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Vedi "/>
+ <template name="seealso" text="Vedi anche "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Livello: "/>
+ <template name="MsgOrig" text="Origine: "/>
+ <template name="MsgAud" text="Pubblico: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/ja.xml b/tests/docbook/common/ja.xml
index 9180e8e1..cb50ff64 100644
--- a/tests/docbook/common/ja.xml
+++ b/tests/docbook/common/ja.xml
@@ -1,104 +1,340 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="ja">
-<!--
-;; Contributors:
-;; Karl Critz, kcritz@mathworks.com, contributed the original dbl1ja.ent file
-;; Ralf Schleitzer, ralf.schleitzer@ixos.de
--->
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="abstract" text="&#x6982;&#x8981;"/>
-<gentext key="appendix" text="&#x4ED8;&#x9332;"/>
-<gentext key="article" text="&#x9805;&#x76EE;"/>
-<gentext key="bibliography" text="&#x53C2;&#x8003;&#x6587;&#x732E;"/>
-<gentext key="book" text="&#x30D6;&#x30C3;&#x30AF;"/>
-<gentext key="caution" text="&#x6CE8;&#x610F;"/>
-<gentext key="caution" text="&#x6CE8;&#x610F;"/>
-<gentext key="chapter" text="&#x7AE0;"/>
-<gentext key="copyright" text="&#x88FD;&#x4F5C;&#x8457;&#x4F5C;"/>
-<gentext key="dedication" text="&#x8B1D;&#x8F9E;"/>
-<gentext key="edition" text="&#x7DE8;&#x96C6;"/>
-<gentext key="equation" text="&#x5F0F;"/>
-<gentext key="example" text="&#x4F8B;"/>
-<gentext key="figure" text="&#x56F3;"/>
-<gentext key="glosssee" text="&#x53C2;&#x8003;"/>
-<gentext key="glossseealso" text="&#x53C2;&#x8003;"/>
-<gentext key="glossary" text="&#x7528;&#x8A9E;&#x96C6;"/>
-<gentext key="important" text="&#x91CD;&#x8981;&#x9805;&#x76EE;"/>
-<gentext key="isbn" text="&#x4953;&#x424E;"/>
-<gentext key="important" text="&#x91CD;&#x8981;&#x9805;&#x76EE;"/>
-<gentext key="index" text="&#x76EE;&#x6B21;"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="&#x4175;&#x6469;&#x656E;&#x6365;"/>
-<gentext key="msglevel" text="&#x30EC;&#x30D9;&#x30EB;"/>
-<gentext key="msgorig" text="&#x30AA;&#x30EA;&#x30B8;&#x30CA;&#x30EB;"/>
-<gentext key="note" text="&#x6CE8;&#x610F;"/>
-<gentext key="note" text="&#x6CE8;&#x610F;"/>
-<gentext key="part" text="&#x30D1;&#x30FC;&#x30C8;"/>
-<gentext key="preface" text="&#x5E8F;&#x6587;"/>
-<gentext key="procedure" text="&#x624B;&#x9806;"/>
-<gentext key="published" text="&#x767A;&#x884C;"/>
-<gentext key="refname" text="&#x540D;&#x524D;"/>
-<gentext key="reference" text="&#x53C2;&#x8003;"/>
-<gentext key="revision" text="&#x6539;&#x8A02;"/>
-<gentext key="revhistory" text="&#x6539;&#x8A02;&#x5C65;&#x6B74;"/>
-<gentext key="section" text="&#x7BC0;"/>
-<gentext key="see" text="&#x53C2;&#x8003;"/>
-<gentext key="seealso" text="&#x53C2;&#x8003;"/>
-<gentext key="set" text="&#x8A2D;&#x5B9A;"/>
-<gentext key="setindex" text="&#x76EE;&#x6B21;&#x8A2D;&#x5B9A;"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="&#x30B9;&#x30C6;&#x30C3;&#x30D7;"/>
-<gentext key="tip" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
-<gentext key="table" text="&#x8868;"/>
-<gentext key="tip" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
-<gentext key="warning" text="&#x8B66;&#x544A;"/>
-<gentext key="warning" text="&#x8B66;&#x544A;"/>
-<gentext key="appendix" text="&#x4ED8;&#x9332;"/>
-<gentext key="chapter" text="&#x7AE0;"/>
-<gentext key="section" text="&#x7BC0;"/>
-<gentext key="sidebar" text="&#x30B5;&#x30A4;&#x30C9;&#x30D0;&#x30FC;"/>
-<gentext key="step" text="&#x30B9;&#x30C6;&#x30C3;&#x30D7;"/>
-<gentext key="seealso" text="&#x53C2;&#x8003;"/>
+ <gentext key="Abstract" text="&#27010;&#35201;"/>
+ <gentext key="abstract" text="&#27010;&#35201;"/>
+ <gentext key="Answer" text="&#21839;&#65306;"/>
+ <gentext key="answer" text="&#21839;&#65306;"/>
+ <gentext key="Appendix" text="&#20184;&#37682;"/>
+ <gentext key="Article" text="&#38917;&#30446;"/>
+ <gentext key="article" text="&#38917;&#30446;"/>
+ <gentext key="Bibliography" text="&#21442;&#32771;&#25991;&#29486;"/>
+ <gentext key="bibliography" text="&#21442;&#32771;&#25991;&#29486;"/>
+ <gentext key="Book" text="&#12502;&#12483;&#12463;"/>
+ <gentext key="book" text="&#12502;&#12483;&#12463;"/>
+ <gentext key="CAUTION" text="&#27880;&#24847;"/>
+ <gentext key="caution" text="&#27880;&#24847;"/>
+ <gentext key="Caution" text="&#27880;&#24847;"/>
+ <gentext key="caution" text="&#27880;&#24847;"/>
+ <gentext key="Chapter1" text="&#31532;"/>
+ <gentext key="chapter1" text="&#31532;"/>
+ <gentext key="Chapter2" text="&#31456;"/>
+ <gentext key="chapter2" text="&#31456;"/>
+ <gentext key="Colophon" text="&#22885;&#20184;"/>
+ <gentext key="colophon" text="&#22885;&#20184;"/>
+ <gentext key="Copyright" text="&#35069;&#20316;&#33879;&#20316;"/>
+ <gentext key="copyright" text="&#35069;&#20316;&#33879;&#20316;"/>
+ <gentext key="Dedication" text="&#35613;&#36766;"/>
+ <gentext key="dedication" text="&#35613;&#36766;"/>
+ <gentext key="Edition" text="&#32232;&#38598;"/>
+ <gentext key="edition" text="&#32232;&#38598;"/>
+ <gentext key="Equation" text="&#24335;"/>
+ <gentext key="equation" text="&#24335;"/>
+ <gentext key="Example" text="&#20363;"/>
+ <gentext key="example" text="&#20363;"/>
+ <gentext key="Figure" text="&#22259;"/>
+ <gentext key="figure" text="&#22259;"/>
+ <gentext key="GlossSee" text="&#21442;&#29031;"/>
+ <gentext key="glosssee" text="&#21442;&#29031;"/>
+ <gentext key="GlossSeeAlso" text="&#21442;&#29031;"/>
+ <gentext key="glossseealso" text="&#21442;&#29031;"/>
+ <gentext key="Glossary" text="&#29992;&#35486;&#38598;"/>
+ <gentext key="glossary" text="&#29992;&#35486;&#38598;"/>
+ <gentext key="IMPORTANT" text="&#37325;&#35201;&#38917;&#30446;"/>
+ <gentext key="important" text="&#37325;&#35201;&#38917;&#30446;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="&#37325;&#35201;&#38917;&#30446;"/>
+ <gentext key="important" text="&#37325;&#35201;&#38917;&#30446;"/>
+ <gentext key="Index" text="&#30446;&#27425;"/>
+ <gentext key="index" text="&#30446;&#27425;"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="&#23550;&#35937;&#32773;"/>
+ <gentext key="msgaud" text="&#23550;&#35937;&#32773;"/>
+ <gentext key="MsgLevel" text="&#12524;&#12505;&#12523;"/>
+ <gentext key="msglevel" text="&#12524;&#12505;&#12523;"/>
+ <gentext key="MsgOrig" text="&#30330;&#20449;&#20803;"/>
+ <gentext key="msgorig" text="&#30330;&#20449;&#20803;"/>
+ <gentext key="NOTE" text="&#27880;&#24847;"/>
+ <gentext key="note" text="&#27880;&#24847;"/>
+ <gentext key="Note" text="&#27880;&#24847;"/>
+ <gentext key="note" text="&#27880;&#24847;"/>
+ <gentext key="Part" text="&#12497;&#12540;&#12488;"/>
+ <gentext key="part" text="&#12497;&#12540;&#12488;"/>
+ <gentext key="Preface" text="&#24207;&#25991;"/>
+ <gentext key="preface" text="&#24207;&#25991;"/>
+ <gentext key="Procedure" text="&#25163;&#38918;"/>
+ <gentext key="procedure" text="&#25163;&#38918;"/>
+ <gentext key="Published" text="&#30330;&#34892;"/>
+ <gentext key="published" text="&#30330;&#34892;"/>
+ <gentext key="Question" text="&#31572;&#65306;"/>
+ <gentext key="question" text="&#31572;&#65306;"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="&#21517;&#21069;"/>
+ <gentext key="refname" text="&#21517;&#21069;"/>
+ <gentext key="Reference" text="&#21442;&#29031;"/>
+ <gentext key="reference" text="&#21442;&#29031;"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="&#27010;&#35201;"/>
+ <gentext key="refsynopsisdiv" text="&#27010;&#35201;"/>
+ <gentext key="Revision" text="&#25913;&#35330;"/>
+ <gentext key="revision" text="&#25913;&#35330;"/>
+ <gentext key="RevHistory" text="&#25913;&#35330;&#23653;&#27508;"/>
+ <gentext key="revhistory" text="&#25913;&#35330;&#23653;&#27508;"/>
+ <gentext key="Section" text="&#38917;"/>
+ <gentext key="See" text="&#21442;&#29031;"/>
+ <gentext key="see" text="&#21442;&#29031;"/>
+ <gentext key="SeeAlso" text="&#21442;&#29031;"/>
+ <gentext key="seealso" text="&#21442;&#29031;"/>
+ <gentext key="Set" text="&#35373;&#23450;"/>
+ <gentext key="set" text="&#35373;&#23450;"/>
+ <gentext key="SetIndex" text="&#30446;&#27425;&#35373;&#23450;"/>
+ <gentext key="setindex" text="&#30446;&#27425;&#35373;&#23450;"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="&#12473;&#12486;&#12483;&#12503;"/>
+ <gentext key="TIP" text="&#12486;&#12451;&#12483;&#12503;"/>
+ <gentext key="tip" text="&#12486;&#12451;&#12483;&#12503;"/>
+ <gentext key="Table" text="&#34920;"/>
+ <gentext key="table" text="&#34920;"/>
+ <gentext key="Tip" text="&#12486;&#12451;&#12483;&#12503;"/>
+ <gentext key="tip" text="&#12486;&#12451;&#12483;&#12503;"/>
+ <gentext key="WARNING" text="&#35686;&#21578;"/>
+ <gentext key="warning" text="&#35686;&#21578;"/>
+ <gentext key="Warning" text="&#35686;&#21578;"/>
+ <gentext key="warning" text="&#35686;&#21578;"/>
+ <gentext key="appendix" text="&#20184;&#37682;"/>
+ <gentext key="chapter" text="&#31456;"/>
+ <gentext key="section" text="&#38917;"/>
+ <gentext key="sidebar" text="&#12469;&#12452;&#12489;&#12496;&#12540;"/>
+ <gentext key="step" text="&#12473;&#12486;&#12483;&#12503;"/>
+ <gentext key="Seealso" text="&#21442;&#29031;"/>
+ <gentext key="seealso" text="&#21442;&#29031;"/>
+ <gentext key="TableofContents" text="&#30446;&#27425;"/>
+ <gentext key="tableofcontents" text="&#30446;&#27425;"/>
+ <gentext key="in" text=""/>
+ <gentext key="by" text="&#65306;"/>
+ <gentext key="Edited" text="&#20316;&#32773;"/>
+ <gentext key="edited" text="&#20316;&#32773;"/>
+ <gentext key="Editedby" text="&#20316;&#32773;&#65306;"/>
+ <gentext key="editedby" text="&#20316;&#32773;&#65306;"/>
+ <gentext key="and" text="&#12289;"/>
+ <gentext key="Notes" text="&#27880;&#24847;"/>
+ <gentext key="notes" text="&#27880;&#24847;"/>
+ <gentext key="TableNotes" text="&#27880;&#24847;"/>
+ <gentext key="tablenotes" text="&#27880;&#24847;"/>
+ <gentext key="nonexistantelement" text="&#35201;&#32032;&#12364;&#23384;&#22312;&#12375;&#12414;&#12379;&#12435;"/>
+ <gentext key="Pgs" text="&#20583;&#29486;"/>
+ <gentext key="pgs" text="&#20583;&#29486;"/>
+ <gentext key="unsupported" text="&#12469;&#12509;&#12540;&#12488;&#12375;&#12414;&#12379;&#12435;"/>
+ <gentext key="xrefto" text="xref to"/>
+ <gentext key="unexpectedelementname" text="&#19981;&#26126;&#12394;&#35201;&#32032;&#21517;"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="&#34920;&#30446;&#27425;"/>
+ <gentext key="listoftables" text="&#34920;&#30446;&#27425;"/>
+ <gentext key="ListofExamples" text="&#20363;&#30446;&#27425;"/>
+ <gentext key="listofexamples" text="&#20363;&#30446;&#27425;"/>
+ <gentext key="ListofFigures" text="&#22259;&#30446;&#27425;"/>
+ <gentext key="listoffigures" text="&#22259;&#30446;&#27425;"/>
+ <gentext key="ListofEquations" text="&#24335;&#30446;&#27425;"/>
+ <gentext key="listofequations" text="&#24335;&#30446;&#27425;"/>
+ <gentext key="ListofUnknown" text="&#19981;&#26126;&#30446;&#27425;"/>
+ <gentext key="listofunknown" text="&#19981;&#26126;&#30446;&#27425;"/>
+ <gentext key="nav-prev" text="&#21069;&#12398;&#12506;&#12540;&#12472;"/>
+ <gentext key="nav-prev-sibling" text="Fast Backward"/>
+ <gentext key="nav-next-sibling" text="Fast Forward"/>
+ <gentext key="nav-next" text="&#27425;&#12398;&#12506;&#12540;&#12472;"/>
+ <gentext key="nav-up" text="&#19978;&#12395;&#25147;&#12427;"/>
+ <gentext key="nav-home" text="&#12507;&#12540;&#12512;"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="TableofContents" text="&#x76EE;&#x6B21;"/>
-<gentext key="in" text="&#x65E5;&#x4ED8;"/>
-<gentext key="by" text="&#xFF1A;"/>
-<gentext key="Edited" text="&#x4F5C;&#x8005;"/>
-<gentext key="Editedby" text="26&#x4564;&#x6974;&#x3B20;&#x2662;&#x793B;"/>
-<gentext key="and" text="&#x3001;"/>
-<gentext key="Notes" text="&#x6CE8;&#x610F;"/>
-<gentext key="TableNotes" text="&#x6CE8;&#x610F;"/>
-<gentext key="nonexistantelement" text="&#x8981;&#x7D20;&#x304C;&#x5B58;&#x5728;&#x3057;&#x307E;&#x305B;&#x3093;"/>
-<gentext key="Pgs" text="&#x5067;&#x732E;"/>
-<gentext key="unsupported" text="&#x30B5;&#x30DD;&#x30FC;&#x30C8;&#x3057;&#x307E;&#x305B;&#x3093;"/>
-<gentext key="xrefto" text="78&#x7265;&#x6620;&#x746F;"/>
-<gentext key="unexpectedelementname" text="&#x4E0D;&#x660E;&#x306A;&#x8981;&#x7D20;&#x540D;"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#20184;&#37682;%n"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="&#31532;%n&#31456;"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#24335; %n. %t"/>
+ <template name="example" text="&#20363; %n. %t"/>
+ <template name="figure" text="&#22259; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#12497;&#12540;&#12488; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#34920; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="ListofTables" text="&#x8868;&#x30EA;&#x30B9;&#x30C8;"/>
-<gentext key="ListofExamples" text="&#x4F8B;&#x984C;&#x30EA;&#x30B9;&#x30C8;"/>
-<gentext key="ListofFigures" text="&#x0046;&#x0069;&#x0067;&#x0075;&#x0072;&#x0065;&#x30EA;&#x30B9;&#x30C8;"/>
-<gentext key="ListofEquations" text="&#x5F0F;&#x30EA;&#x30B9;&#x30C8;"/>
-<gentext key="ListofUnknown" text="&#x4E0D;&#x660E;&#x30EA;&#x30B9;&#x30C8;"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="&#x524D;&#x306E;&#x30DA;&#x30FC;&#x30B8;"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="&#x6B21;&#x306E;&#x30DA;&#x30FC;&#x30B8;"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="xref">
+ <template name="appendix" text="&#20184;&#37682;%n"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="&#31532;%n&#31456;"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#20363; %n. %t"/>
+ <template name="figure" text="&#22259; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#12497;&#12540;&#12488; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#34920; %n. %t"/>
+ </context>
+ <context name="section-xref">
+ <template name="sect1" text="%t&#38917;"/>
+ <template name="sect2" text="%t&#38917;"/>
+ <template name="sect3" text="%t&#38917;"/>
+ <template name="sect4" text="%t&#38917;"/>
+ <template name="sect5" text="%t&#38917;"/>
+ <template name="section" text="%t&#38917;"/>
+ <template name="simplesect" text="%t&#38917;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="&#38917;%n"/>
+ <template name="sect2" text="&#38917;%n"/>
+ <template name="sect3" text="&#38917;%n"/>
+ <template name="sect4" text="&#38917;%n"/>
+ <template name="sect5" text="&#38917;%n"/>
+ <template name="section" text="&#38917;%n"/>
+ <template name="simplesect" text="%t&#38917;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#12289; "/>
+ <template name="seplast" text=", &#12289; "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="&#21442;&#29031; "/>
+ <template name="seealso" text="&#21442;&#29031; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#12524;&#12505;&#12523;: "/>
+ <template name="MsgOrig" text="&#30330;&#20449;&#20803;: "/>
+ <template name="MsgAud" text="&#23550;&#35937;&#32773;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/ko.xml b/tests/docbook/common/ko.xml
index 06dd7cb2..be2f1300 100644
--- a/tests/docbook/common/ko.xml
+++ b/tests/docbook/common/ko.xml
@@ -1,96 +1,335 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="ko">
-<!-- ;; by Park Yong Joo (yongjoo@kldp.org) -->
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="abstract" text="&#xCD08;&#xB85D;"/>
-<gentext key="answer" text="&#xB2F5;&#xBCC0;:"/>
-<gentext key="appendix" text="&#xBD80;&#xB85D;"/>
-<gentext key="article" text="&#xBB38;&#xC11C;"/>
-<gentext key="bibliography" text="&#xC11C;&#xC9C0;&#xC0AC;&#xD56D;"/>
-<gentext key="book" text="&#xCC45;"/>
-<gentext key="caution" text="&#xACBD;&#xACE0;!"/>
-<gentext key="chapter" text=""/>
-<gentext key="colophon" text="&#xD310;&#xAD8C;"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="&#xBC14;&#xCE58;&#xB294; &#xAE00;"/>
-<gentext key="edition" text="&#xAC1C;&#xC815;&#xD310;"/>
-<gentext key="equation" text="&#xC218;&#xC2DD;"/>
-<gentext key="example" text="&#xC608;"/>
-<gentext key="figure" text="&#xADF8;&#xB9BC;"/>
-<gentext key="glosssee" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="glossseealso" text="&#xB2E4;&#xB978; &#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="glossary" text="&#xC6A9;&#xC5B4;&#xD574;&#xC124;"/>
-<gentext key="important" text="[&#xC911;&#xC694;]"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="&#xC911;&#xC694;"/>
-<gentext key="index" text="&#xC0C9;&#xC778;"/>
-<gentext key="legalnotice" text="&#xBC95;&#xC801; &#xACF5;&#xC9C0;"/>
-<gentext key="msgaud" text="&#xB4E3;&#xAE30;"/>
-<gentext key="msglevel" text="&#xB808;&#xBCA8;"/>
-<gentext key="msgorig" text="&#xC6D0;&#xCC9C;"/>
-<gentext key="note" text="&#xCC38;&#xACE0;"/>
-<gentext key="part" text="&#xBD80;&#xBD84;"/>
-<gentext key="preface" text="&#xC11C;&#xBB38;"/>
-<gentext key="procedure" text="&#xC21C;&#xC11C;"/>
-<gentext key="published" text="&#xCD9C;&#xD310;"/>
-<gentext key="question" text="&#xB2F5;&#xBCC0;:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="&#xCC38;&#xACE0;&#xBB38;&#xD5CC;"/>
-<gentext key="refname" text="&#xC81C;&#xBAA9;"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="&#xC694;&#xC57D;"/>
-<gentext key="revision" text="&#xAD50;&#xC815;"/>
-<gentext key="revhistory" text="&#xAD50;&#xC815; &#xACFC;&#xC815;"/>
-<gentext key="section" text=""/>
-<gentext key="see" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="seealso" text="[&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#xB0B4;&#xC6A9;]"/>
-<gentext key="set" text="&#xC804;&#xC9D1;"/>
-<gentext key="setindex" text="&#xC804;&#xC9D1; &#xC0C9;&#xC778;"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="&#xB2E8;&#xACC4;"/>
-<gentext key="table" text="&#xD45C;"/>
-<gentext key="tip" text="&#xC791;&#xC740; &#xC815;&#xBCF4;"/>
-<gentext key="warning" text="&#xC8FC;&#xC758;"/>
+ <gentext key="Abstract" text="&#52488;&#47197;"/>
+ <gentext key="abstract" text="&#52488;&#47197;"/>
+ <gentext key="Answer" text="&#45813;&#48320;"/>
+ <gentext key="answer" text="&#45813;&#48320;"/>
+ <gentext key="Appendix" text="&#48512;&#47197;"/>
+ <gentext key="Article" text="&#47928;&#49436;"/>
+ <gentext key="article" text="&#47928;&#49436;"/>
+ <gentext key="Bibliography" text="&#49436;&#51648;&#49324;&#54637;"/>
+ <gentext key="bibliography" text="&#49436;&#51648;&#49324;&#54637;"/>
+ <gentext key="Book" text="&#52293;"/>
+ <gentext key="book" text="&#52293;"/>
+ <gentext key="CAUTION" text="[&#44221;&#44256;]"/>
+ <gentext key="Caution" text="&#44221;&#44256;"/>
+ <gentext key="Chapter" text="&#51109;"/>
+ <gentext key="Colophon" text="&#54032;&#44428;"/>
+ <gentext key="colophon" text="&#54032;&#44428;"/>
+ <gentext key="Copyright" text="&#51200;&#51089;&#44428;"/>
+ <gentext key="copyright" text="&#51200;&#51089;&#44428;"/>
+ <gentext key="Dedication" text="&#48148;&#52824;&#45716; &#44544;"/>
+ <gentext key="dedication" text="&#48148;&#52824;&#45716; &#44544;"/>
+ <gentext key="Edition" text="&#50670;&#51020;"/>
+ <gentext key="edition" text="&#50670;&#51020;"/>
+ <gentext key="Equation" text="&#49688;&#49885;"/>
+ <gentext key="equation" text="&#49688;&#49885;"/>
+ <gentext key="Example" text="&#50696;"/>
+ <gentext key="example" text="&#50696;"/>
+ <gentext key="Figure" text="&#44536;&#47548;"/>
+ <gentext key="figure" text="&#44536;&#47548;"/>
+ <gentext key="GlossSee" text="&#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="glosssee" text="&#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="GlossSeeAlso" text="&#45796;&#47480; &#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="glossseealso" text="&#45796;&#47480; &#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="Glossary" text="&#50857;&#50612;&#54644;&#49444;"/>
+ <gentext key="glossary" text="&#50857;&#50612;&#54644;&#49444;"/>
+ <gentext key="IMPORTANT" text="[&#51473;&#50836;]"/>
+ <gentext key="important" text="[&#51473;&#50836;]"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="&#51473;&#50836;"/>
+ <gentext key="important" text="&#51473;&#50836;"/>
+ <gentext key="Index" text="&#49353;&#51064;"/>
+ <gentext key="index" text="&#49353;&#51064;"/>
+ <gentext key="LegalNotice" text="&#48277;&#51201; &#44277;&#51648;"/>
+ <gentext key="legalnotice" text="&#48277;&#51201; &#44277;&#51648;"/>
+ <gentext key="MsgAud" text="&#48155;&#45716; &#51060;"/>
+ <gentext key="msgaud" text="&#48155;&#45716; &#51060;"/>
+ <gentext key="MsgLevel" text="&#51473;&#50836;&#46020;"/>
+ <gentext key="msglevel" text="&#51473;&#50836;&#46020;"/>
+ <gentext key="MsgOrig" text="&#48372;&#45236;&#45716; &#51060;"/>
+ <gentext key="msgorig" text="&#48372;&#45236;&#45716; &#51060;"/>
+ <gentext key="NOTE" text="[&#52280;&#44256;]"/>
+ <gentext key="note" text="[&#52280;&#44256;]"/>
+ <gentext key="Note" text="&#52280;&#44256;"/>
+ <gentext key="note" text="&#52280;&#44256;"/>
+ <gentext key="Part" text="&#48512;"/>
+ <gentext key="part" text="&#48512;"/>
+ <gentext key="Preface" text="&#49436;&#47928;"/>
+ <gentext key="preface" text="&#49436;&#47928;"/>
+ <gentext key="Procedure" text="&#51208;&#52264;"/>
+ <gentext key="procedure" text="&#51208;&#52264;"/>
+ <gentext key="Published" text="&#54196;&#45252;"/>
+ <gentext key="published" text="&#54196;&#45252;"/>
+ <gentext key="Question" text="&#51656;&#47928;"/>
+ <gentext key="question" text="&#51656;&#47928;"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="&#52280;&#44256;&#47928;&#54732;"/>
+ <gentext key="reference" text="&#52280;&#44256;&#47928;&#54732;"/>
+ <gentext key="RefName" text="&#51228;&#47785;"/>
+ <gentext key="refname" text="&#51228;&#47785;"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="&#50836;&#50557;"/>
+ <gentext key="refsynopsisdiv" text="&#50836;&#50557;"/>
+ <gentext key="Revision" text="&#44256;&#52840;"/>
+ <gentext key="revision" text="&#44256;&#52840;"/>
+ <gentext key="RevHistory" text="&#44256;&#52828; &#44284;&#51221;"/>
+ <gentext key="revhistory" text="&#44256;&#52828; &#44284;&#51221;"/>
+ <gentext key="Section" text="&#51208;"/>
+ <gentext key="See" text="&#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="see" text="&#49332;&#54196;&#48380; &#45236;&#50857;"/>
+ <gentext key="SeeAlso" text="[&#49332;&#54196;&#48380; &#45796;&#47480; &#45236;&#50857;]"/>
+ <gentext key="seealso" text="[&#49332;&#54196;&#48380; &#45796;&#47480; &#45236;&#50857;]"/>
+ <gentext key="Set" text="&#51204;&#51665;"/>
+ <gentext key="set" text="&#51204;&#51665;"/>
+ <gentext key="SetIndex" text="&#51204;&#51665; &#49353;&#51064;"/>
+ <gentext key="setindex" text="&#51204;&#51665; &#49353;&#51064;"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="&#45800;&#44228;"/>
+ <gentext key="TIP" text="[&#51089;&#51008; &#51221;&#48372;]"/>
+ <gentext key="tip" text="[&#51089;&#51008; &#51221;&#48372;]"/>
+ <gentext key="Table" text="&#54364;"/>
+ <gentext key="table" text="&#54364;"/>
+ <gentext key="Tip" text="&#51089;&#51008; &#51221;&#48372;"/>
+ <gentext key="tip" text="&#51089;&#51008; &#51221;&#48372;"/>
+ <gentext key="WARNING" text="&#51452;&#51032;!"/>
+ <gentext key="warning" text="&#51452;&#51032;!"/>
+ <gentext key="Warning" text="&#51452;&#51032;"/>
+ <gentext key="warning" text="&#51452;&#51032;"/>
+ <gentext key="appendix" text="&#48512;&#47197;"/>
+ <gentext key="chapter" text="&#51109;"/>
+ <gentext key="section" text="&#51208;"/>
+ <gentext key="sidebar" text="&#45927;&#48537;&#51076;"/>
+ <gentext key="step" text="&#45800;&#44228;"/>
+ <gentext key="Seealso" text="&#49332;&#54196;&#48380; &#45796;&#47480; &#45236;&#50857;"/>
+ <gentext key="seealso" text="&#49332;&#54196;&#48380; &#45796;&#47480; &#45236;&#50857;"/>
+ <gentext key="TableofContents" text="&#52264;&#47168;"/>
+ <gentext key="tableofcontents" text="&#52264;&#47168;"/>
+ <gentext key="in" text="-"/>
+ <gentext key="by" text="&#51648;&#51008;&#51060;"/>
+ <gentext key="Edited" text="&#50670;&#51020;"/>
+ <gentext key="edited" text="&#50670;&#51020;"/>
+ <gentext key="Editedby" text="&#50670;&#51008;&#51060;"/>
+ <gentext key="editedby" text="&#50670;&#51008;&#51060;"/>
+ <gentext key="and" text="&#44536;&#47532;&#44256;"/>
+ <gentext key="Notes" text="&#51452;&#49437;"/>
+ <gentext key="notes" text="&#51452;&#49437;"/>
+ <gentext key="TableNotes" text="&#52280;&#44256;"/>
+ <gentext key="tablenotes" text="&#52280;&#44256;"/>
+ <gentext key="nonexistantelement" text="&#51316;&#51116;&#54616;&#51648; &#50506;&#45716; &#44592;&#52488;&#50836;&#49548;&#51077;&#45768;&#45796;"/>
+ <gentext key="Pgs" text="Pgs."/>
+ <gentext key="pgs" text="Pgs."/>
+ <gentext key="unsupported" text="&#51648;&#50896;&#46104;&#51648; &#50506;&#49845;&#45768;&#45796;"/>
+ <gentext key="xrefto" text="&#51060; &#44275;&#51012; &#52280;&#51312;&#54616;&#49464;&#50836; : "/>
+ <gentext key="unexpectedelementname" text="&#50508; &#49688; &#50630;&#45716; &#44592;&#52488;&#50836;&#49548; &#51060;&#47492;&#51077;&#45768;&#45796;"/>
+ <gentext key="Revisedby" text="&#44256;&#52828;&#51060; "/>
+ <gentext key="revisedby" text="&#44256;&#52828;&#51060; "/>
+ <gentext key="ListofTables" text="&#54364; &#47785;&#47197;"/>
+ <gentext key="listoftables" text="&#54364; &#47785;&#47197;"/>
+ <gentext key="ListofExamples" text="&#50696; &#47785;&#47197;"/>
+ <gentext key="listofexamples" text="&#50696; &#47785;&#47197;"/>
+ <gentext key="ListofFigures" text="&#44536;&#47548; &#47785;&#47197;"/>
+ <gentext key="listoffigures" text="&#44536;&#47548; &#47785;&#47197;"/>
+ <gentext key="ListofEquations" text="&#49688;&#49885; &#47785;&#47197;"/>
+ <gentext key="listofequations" text="&#49688;&#49885; &#47785;&#47197;"/>
+ <gentext key="ListofUnknown" text="&#44592;&#53440; &#47785;&#47197;"/>
+ <gentext key="listofunknown" text="&#44592;&#53440; &#47785;&#47197;"/>
+ <gentext key="nav-prev" text="&#51060;&#51204;"/>
+ <gentext key="nav-prev-sibling" text="&#51060;&#51204;&#51004;&#47196; &#44148;&#45320;&#46848;"/>
+ <gentext key="nav-next-sibling" text="&#45796;&#51020;&#51004;&#47196; &#44148;&#45320;&#46848;"/>
+ <gentext key="nav-next" text="&#45796;&#51020;"/>
+ <gentext key="nav-up" text="&#50948;&#47196;"/>
+ <gentext key="nav-home" text="&#52376;&#51020;&#51004;&#47196;"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="TableofContents" text="&#xCC28;&#xB840;"/>
-<gentext key="in" text="-"/>
-<gentext key="by" text="&#xAE00;&#xC4F4;&#xC774; : "/>
-<gentext key="Edited" text="&#xD3B8;&#xC9D1;"/>
-<gentext key="Editedby" text="&#xD3B8;&#xC9D1; : "/>
-<gentext key="and" text="&#xADF8;&#xB9AC;&#xACE0;"/>
-<gentext key="Notes" text="&#xC8FC;&#xC11D;"/>
-<gentext key="TableNotes" text="&#xCC38;&#xACE0;"/>
-<gentext key="nonexistantelement" text="&#xC874;&#xC7AC;&#xD558;&#xC9C0; &#xC54A;&#xB294; &#xAE30;&#xCD08;&#xC694;&#xC18C;&#xC785;&#xB2C8;&#xB2E4;"/>
-<gentext key="Pgs" text="Pgs."/>
-<gentext key="unsupported" text="&#xC9C0;&#xC6D0;&#xB418;&#xC9C0; &#xC54A;&#xC2B5;&#xB2C8;&#xB2E4;"/>
-<gentext key="xrefto" text="&#xC774; &#xACF3;&#xC744; &#xCC38;&#xC870;&#xD558;&#xC138;&#xC694; : "/>
-<gentext key="unexpectedelementname" text="&#xC54C; &#xC218; &#xC5C6;&#xB294; &#xAE30;&#xCD08;&#xC694;&#xC18C; &#xC774;&#xB984;&#xC785;&#xB2C8;&#xB2E4;"/>
-<gentext key="Revisedby" text="&#xAD50;&#xC815; : "/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#48512;&#47197; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="%n&#51109;. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#49688;&#49885; %n. %t"/>
+ <template name="example" text="&#50696; %n. %t"/>
+ <template name="figure" text="&#44536;&#47548; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="%n&#48512;. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#54364; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="ListofTables" text="&#xD45C; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofExamples" text="&#xC608; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofFigures" text="&#xADF8;&#xB9BC; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofEquations" text="&#xC218;&#xC2DD; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofUnknown" text="&#xAE30;&#xD0C0; &#xBAA9;&#xB85D;"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Prev"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="xref">
+ <template name="appendix" text="&#48512;&#47197; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="%n&#51109;. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#50696; %n. %t"/>
+ <template name="figure" text="&#44536;&#47548; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="%n&#48512;. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#54364; %n. %t"/>
+ </context>
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="%n&#51208;"/>
+ <template name="sect2" text="%n&#51208;"/>
+ <template name="sect3" text="%n&#51208;"/>
+ <template name="sect4" text="%n&#51208;"/>
+ <template name="sect5" text="%n&#51208;"/>
+ <template name="section" text="%n&#51208;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#44536;&#47532;&#44256; "/>
+ <template name="seplast" text=", &#44536;&#47532;&#44256; "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="&#49332;&#54196;&#48380; &#45236;&#50857; "/>
+ <template name="seealso" text="&#45796;&#47480; &#49332;&#54196;&#48380; &#45236;&#50857; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#51473;&#50836;&#46020;: "/>
+ <template name="MsgOrig" text="&#48372;&#45236;&#45716; &#51060;: "/>
+ <template name="MsgAud" text="&#48155;&#45716; &#51060;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/l10n.dtd b/tests/docbook/common/l10n.dtd
index 0336baf2..4a48b631 100644
--- a/tests/docbook/common/l10n.dtd
+++ b/tests/docbook/common/l10n.dtd
@@ -1,6 +1,6 @@
<!ELEMENT internationalization (localization+)>
-<!ELEMENT localization (gentext|dingbat|xref)*>
+<!ELEMENT localization (gentext|dingbat|context)*>
<!ATTLIST localization
language CDATA #REQUIRED
>
@@ -17,9 +17,13 @@
text CDATA #REQUIRED
>
-<!ELEMENT xref EMPTY>
-<!ATTLIST xref
- element CDATA #REQUIRED
- text CDATA #REQUIRED
+<!ELEMENT context (template+)>
+<!ATTLIST context
+ name CDATA #REQUIRED
>
+<!ELEMENT template EMPTY>
+<!ATTLIST template
+ name CDATA #REQUIRED
+ text CDATA #REQUIRED
+>
diff --git a/tests/docbook/common/l10n.xml b/tests/docbook/common/l10n.xml
index a7ef90e9..92d6a516 100644
--- a/tests/docbook/common/l10n.xml
+++ b/tests/docbook/common/l10n.xml
@@ -24,6 +24,7 @@
<!ENTITY ru SYSTEM "ru.xml">
<!ENTITY sk SYSTEM "sk.xml">
<!ENTITY sl SYSTEM "sl.xml">
+<!ENTITY sr SYSTEM "sr.xml">
<!ENTITY sv SYSTEM "sv.xml">
<!ENTITY zh_cn SYSTEM "zh_cn.xml">
<!ENTITY zh_tw SYSTEM "zh_tw.xml">
@@ -53,6 +54,7 @@
&ru;
&sk;
&sl;
+&sr;
&sv;
&zh_cn;
&zh_tw;
diff --git a/tests/docbook/common/l10n.xsl b/tests/docbook/common/l10n.xsl
index f2f6fad1..23138ab3 100644
--- a/tests/docbook/common/l10n.xsl
+++ b/tests/docbook/common/l10n.xsl
@@ -240,5 +240,56 @@
</xsl:call-template>
</xsl:template>
+<!-- ============================================================ -->
+
+<xsl:template name="gentext.template">
+ <xsl:param name="context" select="'default'"/>
+ <xsl:param name="name" select="'default'"/>
+ <xsl:param name="lang">
+ <xsl:call-template name="l10n.language"/>
+ </xsl:param>
+
+ <xsl:variable name="localization.node"
+ select="($l10n.xml/internationalization/localization[@language=$lang])[1]"/>
+
+ <xsl:if test="count($localization.node) = 0">
+ <xsl:message>
+ <xsl:text>No "</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>" localization exists.</xsl:text>
+ </xsl:message>
+ </xsl:if>
+
+ <xsl:variable name="context.node"
+ select="$localization.node/context[@name=$context]"/>
+
+ <xsl:if test="count($context.node) = 0">
+ <xsl:message>
+ <xsl:text>No context named "</xsl:text>
+ <xsl:value-of select="$context"/>
+ <xsl:text>" exists in the "</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>" localization.</xsl:text>
+ </xsl:message>
+ </xsl:if>
+
+ <xsl:variable name="template.node"
+ select="$context.node/template[@name=$name][1]"/>
+
+ <xsl:if test="count($template.node) = 0">
+ <xsl:message>
+ <xsl:text>No template named "</xsl:text>
+ <xsl:value-of select="$name"/>
+ <xsl:text>" exists in the context named "</xsl:text>
+ <xsl:value-of select="$context"/>
+ <xsl:text>" in the "</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>" localization.</xsl:text>
+ </xsl:message>
+ </xsl:if>
+
+ <xsl:value-of select="$template.node/@text"/>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/tests/docbook/common/labels.xsl b/tests/docbook/common/labels.xsl
new file mode 100644
index 00000000..a19c23d5
--- /dev/null
+++ b/tests/docbook/common/labels.xsl
@@ -0,0 +1,516 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version='1.0'>
+
+<!-- ============================================================ -->
+<!-- label markup -->
+
+<doc:mode mode="label.markup" xmlns="">
+<refpurpose>Provides access to element labels</refpurpose>
+<refdescription>
+<para>Processing an element in the
+<literal role="mode">label.markup</literal> mode produces the
+element label.</para>
+<para>Trailing punctuation is not added to the label.
+</para>
+</refdescription>
+</doc:mode>
+
+<xsl:template match="*" mode="intralabel.punctuation">
+ <xsl:text>.</xsl:text>
+</xsl:template>
+
+<xsl:template match="*" mode="label.markup">
+ <xsl:message>
+ <xsl:text>Request for label of unexpected element: </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:message>
+</xsl:template>
+
+<xsl:template match="set|book" mode="label.markup">
+ <xsl:if test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="part" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$part.autolabel != 0">
+ <xsl:number from="book" count="part" format="I"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="preface" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$preface.autolabel != 0">
+ <xsl:choose>
+ <xsl:when test="$label.from.part != 0 and ancestor::part">
+ <xsl:number from="part" count="preface" format="1" level="any"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number from="book" count="preface" format="1" level="any"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="chapter" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$chapter.autolabel != 0">
+ <xsl:choose>
+ <xsl:when test="$label.from.part != 0 and ancestor::part">
+ <xsl:number from="part" count="chapter" format="1" level="any"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number from="book" count="chapter" format="1" level="any"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="appendix" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$appendix.autolabel != 0">
+ <xsl:choose>
+ <xsl:when test="$label.from.part != 0 and ancestor::part">
+ <xsl:number from="part" count="appendix" format="A" level="any"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number from="book|article"
+ count="appendix" format="A" level="any"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="article" mode="label.markup">
+ <xsl:if test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="dedication|colophon" mode="label.markup">
+ <xsl:if test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="reference" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$part.autolabel != 0">
+ <xsl:number from="book" count="reference" format="I" level="any"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="refentry" mode="label.markup">
+ <xsl:if test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="section" mode="label.markup">
+ <!-- if this is a nested section, label the parent -->
+ <xsl:if test="local-name(..) = 'section'">
+ <xsl:variable name="parent.section.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.section.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+
+ <!-- if the parent is a component, maybe label that too -->
+ <xsl:variable name="parent.is.component">
+ <xsl:call-template name="is.component">
+ <xsl:with-param name="node" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- does this section get labelled? -->
+ <xsl:variable name="label">
+ <xsl:call-template name="label.this.section">
+ <xsl:with-param name="section" select="."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:if test="($section.label.includes.component.label != 0
+ or /article)
+ and $parent.is.component != 0">
+ <xsl:variable name="parent.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+
+<!--
+ <xsl:message>
+ <xsl:value-of select="$label"/>, <xsl:number count="section"/>
+ </xsl:message>
+-->
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$label != 0">
+ <xsl:number count="section"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="sect1" mode="label.markup">
+ <!-- if the parent is a component, maybe label that too -->
+ <xsl:variable name="parent.is.component">
+ <xsl:call-template name="is.component">
+ <xsl:with-param name="node" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:if test="$section.label.includes.component.label != 0
+ and $parent.is.component">
+ <xsl:variable name="parent.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:number count="sect1"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">
+ <!-- label the parent -->
+ <xsl:variable name="parent.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'sect2'">
+ <xsl:number count="sect2"/>
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'sect3'">
+ <xsl:number count="sect3"/>
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'sect4'">
+ <xsl:number count="sect4"/>
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'sect5'">
+ <xsl:number count="sect5"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message>label.markup: this can't happen!</xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="refsect1" mode="label.markup">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:number count="refsect1"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="refsect2|refsect3" mode="label.markup">
+ <!-- label the parent -->
+ <xsl:variable name="parent.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$section.autolabel != 0">
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'refsect2'">
+ <xsl:number count="refsect2"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number count="refsect3"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="simplesect" mode="label.markup">
+ <!-- if this is a nested section, label the parent -->
+ <xsl:if test="local-name(..) = 'section'
+ or local-name(..) = 'sect1'
+ or local-name(..) = 'sect2'
+ or local-name(..) = 'sect3'
+ or local-name(..) = 'sect4'
+ or local-name(..) = 'sect5'">
+ <xsl:variable name="parent.section.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.section.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+
+ <!-- if the parent is a component, maybe label that too -->
+ <xsl:variable name="parent.is.component">
+ <xsl:call-template name="is.component">
+ <xsl:with-param name="node" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- does this section get labelled? -->
+ <xsl:variable name="label">
+ <xsl:call-template name="label.this.section">
+ <xsl:with-param name="section" select="."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:if test="$section.label.includes.component.label != 0
+ and $parent.is.component != 0">
+ <xsl:variable name="parent.label">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:if test="$parent.label != ''">
+ <xsl:apply-templates select=".." mode="label.markup"/>
+ <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$label != 0">
+ <xsl:number count="simplesect"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="qandadiv" mode="label.markup">
+ <xsl:variable name="lparent" select="(ancestor::set
+ |ancestor::book
+ |ancestor::chapter
+ |ancestor::appendix
+ |ancestor::preface
+ |ancestor::section
+ |ancestor::simplesect
+ |ancestor::sect1
+ |ancestor::sect2
+ |ancestor::sect3
+ |ancestor::sect4
+ |ancestor::sect5
+ |ancestor::refsect1
+ |ancestor::refsect2
+ |ancestor::refsect3)[last()]"/>
+
+ <xsl:variable name="lparent.prefix">
+ <xsl:apply-templates select="$lparent" mode="label.markup"/>
+ </xsl:variable>
+
+ <xsl:variable name="prefix">
+ <xsl:if test="$qanda.inherit.numeration != 0">
+ <xsl:if test="$lparent.prefix != ''">
+ <xsl:apply-templates select="$lparent" mode="label.markup"/>
+ <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="$prefix"/>
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:when test="$qandadiv.autolabel != 0">
+ <xsl:value-of select="$prefix"/>
+ <xsl:number level="multiple" count="qandadiv" format="1"/>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="question|answer" mode="label.markup">
+ <xsl:variable name="lparent" select="(ancestor::set
+ |ancestor::book
+ |ancestor::chapter
+ |ancestor::appendix
+ |ancestor::preface
+ |ancestor::section
+ |ancestor::simplesect
+ |ancestor::sect1
+ |ancestor::sect2
+ |ancestor::sect3
+ |ancestor::sect4
+ |ancestor::sect5
+ |ancestor::refsect1
+ |ancestor::refsect2
+ |ancestor::refsect3)[last()]"/>
+
+ <xsl:variable name="lparent.prefix">
+ <xsl:apply-templates select="$lparent" mode="label.markup"/>
+ </xsl:variable>
+
+ <xsl:variable name="prefix">
+ <xsl:if test="$qanda.inherit.numeration != 0">
+ <xsl:if test="$lparent.prefix != ''">
+ <xsl:apply-templates select="$lparent" mode="label.markup"/>
+ <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
+ </xsl:if>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:variable name="inhlabel"
+ select="ancestor-or-self::qandaset/@defaultlabel[1]"/>
+
+ <xsl:variable name="deflabel">
+ <xsl:choose>
+ <xsl:when test="$inhlabel != ''">
+ <xsl:value-of select="$inhlabel"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$qanda.defaultlabel"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="label" select="label"/>
+
+ <xsl:choose>
+ <xsl:when test="count($label)>0">
+ <xsl:value-of select="$prefix"/>
+ <xsl:apply-templates select="$label"/>
+ </xsl:when>
+
+ <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'question'">
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Question'"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'answer'">
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Answer'"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <xsl:when test="$deflabel = 'number'">
+ <xsl:if test="name(.) = 'question'">
+ <xsl:value-of select="$prefix"/>
+ <xsl:number level="multiple" count="qandaentry" format="1"/>
+ </xsl:if>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="bibliography|glossary|index" mode="label.markup">
+ <xsl:if test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="figure|table|example|equation" mode="label.markup">
+ <xsl:variable name="pchap"
+ select="ancestor::chapter|ancestor::appendix"/>
+
+ <xsl:variable name="prefix">
+ <xsl:if test="count($pchap) &gt; 0">
+ <xsl:apply-templates select="$pchap" mode="label.markup"/>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="@label">
+ <xsl:value-of select="@label"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="count($pchap)>0">
+ <xsl:if test="$prefix != ''">
+ <xsl:apply-templates select="$pchap" mode="label.markup"/>
+ <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
+ </xsl:if>
+ <xsl:number format="1" from="chapter|appendix" level="any"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:number format="1" from="book|article" level="any"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="abstract" mode="label.markup">
+ <!-- nop -->
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template name="label.this.section">
+ <xsl:param name="section" select="."/>
+ <xsl:value-of select="$section.autolabel"/>
+</xsl:template>
+
+<doc:template name="label.this.section" xmlns="">
+<refpurpose>Returns true if $section should be labelled</refpurpose>
+<refdescription>
+<para>Returns true if the specified section should be labelled.
+By default, this template simply returns $section.autolabel, but
+custom stylesheets may override it to get more selective behavior.</para>
+</refdescription>
+</doc:template>
+
+<!-- ============================================================ -->
+
+</xsl:stylesheet>
diff --git a/tests/docbook/common/nl.xml b/tests/docbook/common/nl.xml
index 56ead54d..83d555ab 100644
--- a/tests/docbook/common/nl.xml
+++ b/tests/docbook/common/nl.xml
@@ -1,105 +1,338 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="nl">
-<!-- Updated by Frederik Fouvry, fouvry@essex.ac.uk -->
-<!-- Vincent Partington, vincent.partington@graddelt.com -->
-<!-- Updated by Erwin Bolwidt, ejb@tryllian.com, august 2000 -->
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="abstract" text="Overzicht"/>
-<gentext key="answer" text="A:"/>
-<gentext key="appendix" text="Aanhangsel"/>
-<gentext key="article" text="Artikel"/>
-<gentext key="bibliography" text="Bibliografie"/>
-<gentext key="book" text="Boek"/>
-<gentext key="caution" text="Waarschuwing"/>
-<gentext key="chapter" text="Hoofdstuk"/>
-<gentext key="colophon" text="Colofon"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Opdracht"/>
-<gentext key="edition" text="Uitgave"/>
-<gentext key="equation" text="Vergelijking"/>
-<gentext key="example" text="Voorbeeld"/>
-<gentext key="figure" text="Figuur"/>
-<gentext key="glossary" text="Woordenlijst"/>
-<gentext key="glosssee" text="Zie"/>
-<gentext key="glossseealso" text="Zie ook"/>
-<gentext key="important" text="Belangrijk"/>
-<gentext key="index" text="Index"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="legalnotice" text="Juridische mededeling"/>
-<gentext key="msgaud" text="Doelgroep"/>
-<gentext key="msglevel" text="Ernst"/>
-<gentext key="msgorig" text="Afkomst"/>
-<gentext key="note" text="N.B."/>
-<gentext key="part" text="Deel"/>
-<gentext key="preface" text="Inleiding"/>
-<gentext key="procedure" text="Procedure"/>
-<gentext key="published" text="Gepubliceerd"/>
-<gentext key="pubdate" text="Gepubliceerd"/>
-<gentext key="question" text="V:"/>
-<gentext key="refentry" text="Referentielemma"/>
-<gentext key="reference" text="Referentie"/>
-<gentext key="refname" text="Referentienaam"/>
-<gentext key="refsection" text="Referentieparagraaf"/>
-<gentext key="refsynopsisdiv" text="Samenvatting"/>
-<gentext key="revhistory" text="Revisie verloop"/>
-<gentext key="revision" text="Revisie"/>
-<gentext key="section" text="Sectie"/>
-<gentext key="sect1" text="Sectie"/>
-<gentext key="sect2" text="Sectie"/>
-<gentext key="sect3" text="Sectie"/>
-<gentext key="sect4" text="Sectie"/>
-<gentext key="sect5" text="Sectie"/>
-<gentext key="see" text="Zie"/>
-<gentext key="seealso" text="Zie ook"/>
-<gentext key="set" text="Verzameling"/>
-<gentext key="setindex" text="Hoofdindex"/>
-<gentext key="sidebar" text="Excursie"/>
-<gentext key="step" text="Stap"/>
-<gentext key="table" text="Tabel"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="Waarschuwing"/>
+ <gentext key="Abstract" text="Samenvatting"/>
+ <gentext key="abstract" text="Samenvatting"/>
+ <gentext key="Answer" text="Antwoord:"/>
+ <gentext key="answer" text="Antwoord:"/>
+ <gentext key="Appendix" text="Aanhangsel"/>
+ <gentext key="Article" text="Artikel"/>
+ <gentext key="article" text="Artikel"/>
+ <gentext key="Bibliography" text="Literatuurlijst"/>
+ <gentext key="bibliography" text="Literatuurlijst"/>
+ <gentext key="Book" text="Boek"/>
+ <gentext key="book" text="Boek"/>
+ <gentext key="CAUTION" text="LET OP"/>
+ <gentext key="caution" text="LET OP"/>
+ <gentext key="Caution" text="Let op"/>
+ <gentext key="caution" text="Let op"/>
+ <gentext key="Chapter" text="Hoofdstuk"/>
+ <gentext key="Colophon" text="Colofon"/>
+ <gentext key="colophon" text="Colofon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Opdracht"/>
+ <gentext key="dedication" text="Opdracht"/>
+ <gentext key="Edition" text="Uitgave"/>
+ <gentext key="edition" text="Uitgave"/>
+ <gentext key="Equation" text="Vergelijking"/>
+ <gentext key="equation" text="Vergelijking"/>
+ <gentext key="Example" text="Voorbeeld"/>
+ <gentext key="example" text="Voorbeeld"/>
+ <gentext key="Figure" text="Figuur"/>
+ <gentext key="figure" text="Figuur"/>
+ <gentext key="GlossSee" text="Zie"/>
+ <gentext key="glosssee" text="Zie"/>
+ <gentext key="GlossSeeAlso" text="Zie ook"/>
+ <gentext key="glossseealso" text="Zie ook"/>
+ <gentext key="Glossary" text="Woordenlijst"/>
+ <gentext key="glossary" text="Woordenlijst"/>
+ <gentext key="IMPORTANT" text="BELANGRIJK"/>
+ <gentext key="important" text="BELANGRIJK"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Belangrijk"/>
+ <gentext key="important" text="Belangrijk"/>
+ <gentext key="Index" text="Register"/>
+ <gentext key="index" text="Register"/>
+ <gentext key="LegalNotice" text="Bericht"/>
+ <gentext key="legalnotice" text="Bericht"/>
+ <gentext key="MsgAud" text="Doelgroep"/>
+ <gentext key="msgaud" text="Doelgroep"/>
+ <gentext key="MsgLevel" text="Niveau"/>
+ <gentext key="msglevel" text="Niveau"/>
+ <gentext key="MsgOrig" text="Herkomst"/>
+ <gentext key="msgorig" text="Herkomst"/>
+ <gentext key="NOTE" text="OPMERKING"/>
+ <gentext key="note" text="OPMERKING"/>
+ <gentext key="Note" text="Opmerking"/>
+ <gentext key="note" text="Opmerking"/>
+ <gentext key="Part" text="Deel"/>
+ <gentext key="part" text="Deel"/>
+ <gentext key="Preface" text="Voorwoord"/>
+ <gentext key="preface" text="Voorwoord"/>
+ <gentext key="Procedure" text="Procedure"/>
+ <gentext key="procedure" text="Procedure"/>
+ <gentext key="Published" text="Uitgegeven"/>
+ <gentext key="published" text="Uitgegeven"/>
+ <gentext key="Question" text="Vraag:"/>
+ <gentext key="question" text="Vraag:"/>
+ <gentext key="RefEntry" text="Referentielemma"/>
+ <gentext key="refentry" text="Referentielemma"/>
+ <gentext key="Reference" text="Referentie"/>
+ <gentext key="reference" text="Referentie"/>
+ <gentext key="RefName" text="Referentienaam"/>
+ <gentext key="refname" text="Referentienaam"/>
+ <gentext key="RefSection" text="Referentieparagraaf"/>
+ <gentext key="refsection" text="Referentieparagraaf"/>
+ <gentext key="RefSynopsisDiv" text="Referentiesamenvatting"/>
+ <gentext key="refsynopsisdiv" text="Referentiesamenvatting"/>
+ <gentext key="Revision" text="Herziening"/>
+ <gentext key="revision" text="Herziening"/>
+ <gentext key="RevHistory" text="Wijzigingen"/>
+ <gentext key="revhistory" text="Wijzigingen"/>
+ <gentext key="Section" text="Paragraaf"/>
+ <gentext key="See" text="Zie"/>
+ <gentext key="see" text="Zie"/>
+ <gentext key="SeeAlso" text="Zie ook"/>
+ <gentext key="seealso" text="Zie ook"/>
+ <gentext key="Set" text="Verzameling"/>
+ <gentext key="set" text="Verzameling"/>
+ <gentext key="SetIndex" text="Hoofdregister"/>
+ <gentext key="setindex" text="Hoofdregister"/>
+ <gentext key="Sidebar" text="Excursie"/>
+ <gentext key="Step" text="Stap"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="tip" text="TIP"/>
+ <gentext key="Table" text="Tabel"/>
+ <gentext key="table" text="Tabel"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="WAARSCHUWING"/>
+ <gentext key="warning" text="WAARSCHUWING"/>
+ <gentext key="Warning" text="Waarschuwing"/>
+ <gentext key="warning" text="Waarschuwing"/>
+ <gentext key="appendix" text="aanhangsel"/>
+ <gentext key="chapter" text="hoofdstuk"/>
+ <gentext key="section" text="paragraaf"/>
+ <gentext key="sidebar" text="excursie"/>
+ <gentext key="step" text="stap"/>
+ <gentext key="Seealso" text="Zie ook"/>
+ <gentext key="seealso" text="Zie ook"/>
+ <gentext key="TableofContents" text="Inhoudsopgave"/>
+ <gentext key="tableofcontents" text="Inhoudsopgave"/>
+ <gentext key="in" text="in"/>
+ <gentext key="by" text="door"/>
+ <gentext key="Edited" text="Redactie"/>
+ <gentext key="edited" text="Redactie"/>
+ <gentext key="Editedby" text="Redactie door"/>
+ <gentext key="editedby" text="Redactie door"/>
+ <gentext key="and" text="en"/>
+ <gentext key="Notes" text="Noten"/>
+ <gentext key="notes" text="Noten"/>
+ <gentext key="TableNotes" text="Opmerkingen"/>
+ <gentext key="tablenotes" text="Opmerkingen"/>
+ <gentext key="nonexistantelement" text="niet bestaand element"/>
+ <gentext key="Pgs" text="blz."/>
+ <gentext key="pgs" text="blz."/>
+ <gentext key="unsupported" text="niet ondersteund"/>
+ <gentext key="xrefto" text="verwijzing naar"/>
+ <gentext key="unexpectedelementname" text="ONVERWACHT-ELEMENT"/>
+ <gentext key="Revisedby" text="Herzien door: "/>
+ <gentext key="revisedby" text="Herzien door: "/>
+ <gentext key="ListofTables" text="Lijst van tabellen"/>
+ <gentext key="listoftables" text="Lijst van tabellen"/>
+ <gentext key="ListofExamples" text="Lijst van voorbeelden"/>
+ <gentext key="listofexamples" text="Lijst van voorbeelden"/>
+ <gentext key="ListofFigures" text="Lijst van figuren"/>
+ <gentext key="listoffigures" text="Lijst van figuren"/>
+ <gentext key="ListofEquations" text="Lijst van vergelijkingen"/>
+ <gentext key="listofequations" text="Lijst van vergelijkingen"/>
+ <gentext key="ListofUnknown" text="Lijst van ???"/>
+ <gentext key="listofunknown" text="Lijst van ???"/>
+ <gentext key="nav-prev" text="Terug"/>
+ <gentext key="nav-prev-sibling" text="Verder terug"/>
+ <gentext key="nav-next-sibling" text="Verder vooruit"/>
+ <gentext key="nav-next" text="Volgende"/>
+ <gentext key="nav-up" text="Omhoog"/>
+ <gentext key="nav-home" text="Begin"/>
+ <gentext key="sectioncalled" text="de sectie genaamd"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="TableofContents" text="Inhoudsopgave"/>
-<gentext key="in" text="in"/>
-<gentext key="by" text="door"/>
-<gentext key="Edited" text="Redactie"/>
-<gentext key="Editedby" text="Redactie door"/>
-<gentext key="and" text="en"/>
-<gentext key="Notes" text="Opmerkingen"/>
-<gentext key="TableNotes" text="Opmerkingen"/>
-<gentext key="nonexistantelement" text="niet-bestaand element"/>
-<gentext key="Pgs" text="blz."/>
-<gentext key="unsupported" text="niet ondersteund"/>
-<gentext key="xrefto" text="verwijzing naar"/>
-<gentext key="unexpectedelementname" text="Onverwachte naam van element"/>
-<gentext key="Revisedby" text="Herzien door:"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Aanhangsel %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Hoofdstuk %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Vergelijking %n. %t"/>
+ <template name="example" text="Voorbeeld %n. %t"/>
+ <template name="figure" text="Figuur %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Deel %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="ListofTables" text="Lijst van Tabellen"/>
-<gentext key="ListofExamples" text="Lijst van Voorbeelden"/>
-<gentext key="ListofFigures" text="Lijst van Figuren"/>
-<gentext key="ListofEquations" text="Lijst van Vergelijkingen"/>
-<gentext key="ListofUnknown" text="Lijst van Onbekends"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Vorige"/>
-<gentext key="nav-prev-sibling" text="Snel terug"/>
-<gentext key="nav-next-sibling" text="Snel vooruit"/>
-<gentext key="nav-next" text="Volgende"/>
-<gentext key="nav-up" text="Omhoog"/>
-<gentext key="nav-home" text="Begin"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<gentext key="the section called" text="de sectie genaamd"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="xref">
+ <template name="appendix" text="Aanhangsel %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Hoofdstuk %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Voorbeeld %n. %t"/>
+ <template name="figure" text="Figuur %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Deel %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ </context>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+ <context name="section-xref">
+ <template name="sect1" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="sect2" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="sect3" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="sect4" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="sect5" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="section" text="de sectie genaamd &#8220;%t&#8221;"/>
+ <template name="simplesect" text="de sectie genaamd &#8220;%t&#8221;"/>
+ </context>
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Paragraaf %n"/>
+ <template name="sect2" text="Paragraaf %n"/>
+ <template name="sect3" text="Paragraaf %n"/>
+ <template name="sect4" text="Paragraaf %n"/>
+ <template name="sect5" text="Paragraaf %n"/>
+ <template name="section" text="Paragraaf %n"/>
+ <template name="simplesect" text="de sectie genaamd &#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" en "/>
+ <template name="seplast" text=", en "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Zie "/>
+ <template name="seealso" text="Zie ook "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Niveau: "/>
+ <template name="MsgOrig" text="Herkomst: "/>
+ <template name="MsgAud" text="Doelgroep: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/no.xml b/tests/docbook/common/no.xml
index b3aba44f..ba3620cf 100644
--- a/tests/docbook/common/no.xml
+++ b/tests/docbook/common/no.xml
@@ -1,97 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="no">
-<gentext key="abstract" text="Abstract"/>
-<gentext key="appendix" text="Tillegg"/>
-<gentext key="article" text=""/>
-<gentext key="bibliography" text="Bibliografi"/>
-<gentext key="book" text=""/>
-<gentext key="caution" text="OBS"/>
-<gentext key="caution" text="Obs"/>
-<gentext key="chapter" text="Kapittel"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedikasjon"/>
-<gentext key="edition" text=""/>
-<gentext key="equation" text="Formel"/>
-<gentext key="example" text="Eksempel"/>
-<gentext key="figure" text="Figur"/>
-<gentext key="glosssee" text="Se"/>
-<gentext key="glossseealso" text="Se Ogs&#x00E5;"/>
-<gentext key="glossary" text="Ordliste"/>
-<gentext key="important" text="VIKTIG"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Viktig"/>
-<gentext key="index" text="Indeks"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="Publikum"/>
-<gentext key="msglevel" text="Niv&#x00E5;"/>
-<gentext key="msgorig" text="Opphav"/>
-<gentext key="note" text="NOTAT"/>
-<gentext key="note" text="Notat"/>
-<gentext key="part" text="Del"/>
-<gentext key="preface" text="Forord"/>
-<gentext key="procedure" text="Prosedyre"/>
-<gentext key="published" text=""/>
-<gentext key="refname" text="Navn"/>
-<gentext key="reference" text="Referanse"/>
-<gentext key="revision" text="Revisjon"/>
-<gentext key="revhistory" text="Revisjonshistorie"/>
-<gentext key="section" text="Seksjon"/>
-<gentext key="see" text="Se"/>
-<gentext key="seealso" text="Se Ogs&#x00E5;"/>
-<gentext key="set" text=""/>
-<gentext key="setindex" text="Indeks"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Steg"/>
-<gentext key="tip" text="TIPS"/>
-<gentext key="table" text="Tabell"/>
-<gentext key="tip" text="Tips"/>
-<gentext key="warning" text="ADVARSEL"/>
-<gentext key="warning" text="Advarsel"/>
-<gentext key="appendix" text="Tillegg"/>
-<gentext key="chapter" text="Kapittel"/>
-<gentext key="section" text="seksjon"/>
-<gentext key="step" text="steg"/>
-<gentext key="seealso" text="Se ogs&#x00E5;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Innholdsfortegnelse"/>
-<gentext key="in" text="i"/>
-<gentext key="by" text="av"/>
-<gentext key="Edited" text="Redigert"/>
-<gentext key="Editedby" text="Redigert av"/>
-<gentext key="and" text="og"/>
-<gentext key="Notes" text="Sluttnotater"/>
-<gentext key="TableNotes" text="Notater"/>
-<gentext key="nonexistantelement" text="ikke-eksisterende element"/>
-<gentext key="Pgs" text="Sdr."/>
-<gentext key="unsupported" text="ikke st&#x2298;ttet"/>
-<gentext key="xrefto" text="xref til"/>
-<gentext key="unexpectedelementname" text="UVENTET-ELEMENTNAVN"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Abstract"/>
+ <gentext key="abstract" text="Abstract"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Tillegg"/>
+ <gentext key="Article" text=""/>
+ <gentext key="article" text=""/>
+ <gentext key="Bibliography" text="Bibliografi"/>
+ <gentext key="bibliography" text="Bibliografi"/>
+ <gentext key="Book" text=""/>
+ <gentext key="book" text=""/>
+ <gentext key="CAUTION" text="OBS"/>
+ <gentext key="caution" text="OBS"/>
+ <gentext key="Caution" text="Obs"/>
+ <gentext key="caution" text="Obs"/>
+ <gentext key="Chapter" text="Kapittel"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedikasjon"/>
+ <gentext key="dedication" text="Dedikasjon"/>
+ <gentext key="Edition" text=""/>
+ <gentext key="edition" text=""/>
+ <gentext key="Equation" text="Formel"/>
+ <gentext key="equation" text="Formel"/>
+ <gentext key="Example" text="Eksempel"/>
+ <gentext key="example" text="Eksempel"/>
+ <gentext key="Figure" text="Figur"/>
+ <gentext key="figure" text="Figur"/>
+ <gentext key="GlossSee" text="Se"/>
+ <gentext key="glosssee" text="Se"/>
+ <gentext key="GlossSeeAlso" text="Se Ogs&#229;"/>
+ <gentext key="glossseealso" text="Se Ogs&#229;"/>
+ <gentext key="Glossary" text="Ordliste"/>
+ <gentext key="glossary" text="Ordliste"/>
+ <gentext key="IMPORTANT" text="VIKTIG"/>
+ <gentext key="important" text="VIKTIG"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Viktig"/>
+ <gentext key="important" text="Viktig"/>
+ <gentext key="Index" text="Indeks"/>
+ <gentext key="index" text="Indeks"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="Publikum"/>
+ <gentext key="msgaud" text="Publikum"/>
+ <gentext key="MsgLevel" text="Niv&#229;"/>
+ <gentext key="msglevel" text="Niv&#229;"/>
+ <gentext key="MsgOrig" text="Opphav"/>
+ <gentext key="msgorig" text="Opphav"/>
+ <gentext key="NOTE" text="NOTAT"/>
+ <gentext key="note" text="NOTAT"/>
+ <gentext key="Note" text="Notat"/>
+ <gentext key="note" text="Notat"/>
+ <gentext key="Part" text="Del"/>
+ <gentext key="part" text="Del"/>
+ <gentext key="Preface" text="Forord"/>
+ <gentext key="preface" text="Forord"/>
+ <gentext key="Procedure" text="Prosedyre"/>
+ <gentext key="procedure" text="Prosedyre"/>
+ <gentext key="Published" text=""/>
+ <gentext key="published" text=""/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Navn"/>
+ <gentext key="refname" text="Navn"/>
+ <gentext key="Reference" text="Referanse"/>
+ <gentext key="reference" text="Referanse"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Revisjon"/>
+ <gentext key="revision" text="Revisjon"/>
+ <gentext key="RevHistory" text="Revisjonshistorie"/>
+ <gentext key="revhistory" text="Revisjonshistorie"/>
+ <gentext key="Section" text="Seksjon"/>
+ <gentext key="See" text="Se"/>
+ <gentext key="see" text="Se"/>
+ <gentext key="SeeAlso" text="Se Ogs&#229;"/>
+ <gentext key="seealso" text="Se Ogs&#229;"/>
+ <gentext key="Set" text=""/>
+ <gentext key="set" text=""/>
+ <gentext key="SetIndex" text="Indeks"/>
+ <gentext key="setindex" text="Indeks"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="sidebar" text=""/>
+ <gentext key="Step" text="Steg"/>
+ <gentext key="TIP" text="TIPS"/>
+ <gentext key="tip" text="TIPS"/>
+ <gentext key="Table" text="Tabell"/>
+ <gentext key="table" text="Tabell"/>
+ <gentext key="Tip" text="Tips"/>
+ <gentext key="tip" text="Tips"/>
+ <gentext key="WARNING" text="ADVARSEL"/>
+ <gentext key="warning" text="ADVARSEL"/>
+ <gentext key="Warning" text="Advarsel"/>
+ <gentext key="warning" text="Advarsel"/>
+ <gentext key="appendix" text="Tillegg"/>
+ <gentext key="chapter" text="Kapittel"/>
+ <gentext key="section" text="seksjon"/>
+ <gentext key="step" text="steg"/>
+ <gentext key="Seealso" text="Se ogs&#229;"/>
+ <gentext key="seealso" text="Se ogs&#229;"/>
+ <gentext key="TableofContents" text="Innholdsfortegnelse"/>
+ <gentext key="tableofcontents" text="Innholdsfortegnelse"/>
+ <gentext key="in" text="i"/>
+ <gentext key="by" text="av"/>
+ <gentext key="Edited" text="Redigert"/>
+ <gentext key="edited" text="Redigert"/>
+ <gentext key="Editedby" text="Redigert av"/>
+ <gentext key="editedby" text="Redigert av"/>
+ <gentext key="and" text="og"/>
+ <gentext key="Notes" text="Sluttnotater"/>
+ <gentext key="notes" text="Sluttnotater"/>
+ <gentext key="TableNotes" text="Notater"/>
+ <gentext key="tablenotes" text="Notater"/>
+ <gentext key="nonexistantelement" text="ikke-eksisterende element"/>
+ <gentext key="Pgs" text="Sdr."/>
+ <gentext key="pgs" text="Sdr."/>
+ <gentext key="unsupported" text="ikke st&#248;ttet"/>
+ <gentext key="xrefto" text="xref til"/>
+ <gentext key="unexpectedelementname" text="UVENTET-ELEMENTNAVN"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Tabelloversikt"/>
+ <gentext key="listoftables" text="Tabelloversikt"/>
+ <gentext key="ListofExamples" text="Eksempeloversikt"/>
+ <gentext key="listofexamples" text="Eksempeloversikt"/>
+ <gentext key="ListofFigures" text="Figuroversikt"/>
+ <gentext key="listoffigures" text="Figuroversikt"/>
+ <gentext key="ListofEquations" text="Formeloversikt"/>
+ <gentext key="listofequations" text="Formeloversikt"/>
+ <gentext key="ListofUnknown" text="???-oversikt"/>
+ <gentext key="listofunknown" text="???-oversikt"/>
+ <gentext key="nav-prev" text="Forrige"/>
+ <gentext key="nav-prev-sibling" text="Raskt Bakover"/>
+ <gentext key="nav-next-sibling" text="Raskt Fremover"/>
+ <gentext key="nav-next" text="Neste"/>
+ <gentext key="nav-up" text="Opp"/>
+ <gentext key="nav-home" text="Hjem"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Tabelloversikt"/>
-<gentext key="ListofExamples" text="Eksempeloversikt"/>
-<gentext key="ListofFigures" text="Figuroversikt"/>
-<gentext key="ListofEquations" text="Formeloversikt"/>
-<gentext key="ListofUnknown" text="???-oversikt"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Tillegg %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapittel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Formel %n. %t"/>
+ <template name="example" text="Eksempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabell %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Forrige"/>
-<gentext key="nav-prev-sibling" text="Raskt Bakover"/>
-<gentext key="nav-next-sibling" text="Raskt Fremover"/>
-<gentext key="nav-next" text="Neste"/>
-<gentext key="nav-up" text="Opp"/>
-<gentext key="nav-home" text="Hjem"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Tillegg %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Kapittel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Eksempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabell %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Seksjon %n"/>
+ <template name="sect2" text="Seksjon %n"/>
+ <template name="sect3" text="Seksjon %n"/>
+ <template name="sect4" text="Seksjon %n"/>
+ <template name="sect5" text="Seksjon %n"/>
+ <template name="section" text="Seksjon %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" og "/>
+ <template name="seplast" text=", og "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Se "/>
+ <template name="seealso" text="Se Ogs&#229; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Niv&#229;: "/>
+ <template name="MsgOrig" text="Opphav: "/>
+ <template name="MsgAud" text="Publikum: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/pl.xml b/tests/docbook/common/pl.xml
index 8582bbeb..afa12ed2 100644
--- a/tests/docbook/common/pl.xml
+++ b/tests/docbook/common/pl.xml
@@ -1,96 +1,323 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="pl">
-<gentext key="abstract" text="Abstrakt"/>
-<gentext key="appendix" text="Dodatek"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Book"/>
-<gentext key="caution" text="PRZYPADEK"/>
-<gentext key="caution" text="Przypadek"/>
-<gentext key="chapter" text="Rozdzia&#179;"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedykacja"/>
-<gentext key="edition" text="Wydanie"/>
-<gentext key="equation" text="R&#243;wnanie"/>
-<gentext key="example" text="Przyk&#179;ad"/>
-<gentext key="figure" text="Rysunek"/>
-<gentext key="glosssee" text="Patrz"/>
-<gentext key="glossseealso" text="Patrz te&#191;"/>
-<gentext key="glossary" text="Glossary"/>
-<gentext key="important" text="WA&#175;NE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="WA&#175;NE"/>
-<gentext key="index" text="Indeks"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="Odbiorcy"/>
-<gentext key="msglevel" text="Poziom"/>
-<gentext key="msgorig" text="Nadawca"/>
-<gentext key="note" text="NOTATKA"/>
-<gentext key="note" text="Notatka"/>
-<gentext key="part" text="Cz&#234;&#182;&#230;"/>
-<gentext key="preface" text="Przedmowa"/>
-<gentext key="procedure" text="Procedura"/>
-<gentext key="published" text="Data wydania"/>
-<gentext key="refname" text="Nazwa"/>
-<gentext key="reference" text="Materia&#179;y &#188;r&#243;d&#179;owe"/>
-<gentext key="revision" text="Zmiana"/>
-<gentext key="revhistory" text="Historia zmian"/>
-<gentext key="section" text="Sekcja"/>
-<gentext key="see" text="Patrz"/>
-<gentext key="seealso" text="Patrz Te&#191;"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Indeks"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="krok"/>
-<gentext key="tip" text="Podpowied&#188;"/>
-<gentext key="table" text="Tabela"/>
-<gentext key="tip" text="Podpowied&#188;"/>
-<gentext key="warning" text="Ostrze&#191;enie"/>
-<gentext key="warning" text="Ostrze&#191;enie"/>
-<gentext key="appendix" text="dodatek"/>
-<gentext key="chapter" text="rozdzia&#179;"/>
-<gentext key="section" text="sekcja"/>
-<gentext key="step" text="krok"/>
-<gentext key="seealso" text="Patrz te&#191;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Spis tre&#182;ci"/>
-<gentext key="in" text="w"/>
-<gentext key="by" text=""/>
-<gentext key="Editedby" text="Redakcja: "/>
-<gentext key="and" text="i"/>
-<gentext key="Notes" text="Przypisy"/>
-<gentext key="TableNotes" text="Przypisy"/>
-<gentext key="nonexistantelement" text="nie istniej&#177;cy element"/>
-<gentext key="Pgs" text="stron"/>
-<gentext key="unsupported" text="nie wspierany"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Abstrakt"/>
+ <gentext key="abstract" text="Abstrakt"/>
+ <gentext key="Answer" text="Odp:"/>
+ <gentext key="Appendix" text="Dodatek"/>
+ <gentext key="appendix" text="dodatek"/>
+ <gentext key="Article" text="Artyku&#322;"/>
+ <gentext key="article" text="Artyku&#322;"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Ksi&#261;&#380;ka"/>
+ <gentext key="book" text="Ksi&#261;&#380;ka"/>
+ <gentext key="CAUTION" text="PRZYPADEK"/>
+ <gentext key="Caution" text="Uwaga!"/>
+ <gentext key="caution" text="Uwaga!"/>
+ <gentext key="Chapter" text="Rozdzia&#322;"/>
+ <gentext key="chapter" text="rozdzia&#322;;"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedykacja"/>
+ <gentext key="dedication" text="Dedykacja"/>
+ <gentext key="Edition" text="Wydanie"/>
+ <gentext key="edition" text="Wydanie"/>
+ <gentext key="Equation" text="R&#243;wnanie"/>
+ <gentext key="equation" text="R&#243;wnanie"/>
+ <gentext key="Example" text="Przyk&#322;ad"/>
+ <gentext key="example" text="Przyk&#322;ad"/>
+ <gentext key="Figure" text="Rysunek"/>
+ <gentext key="figure" text="Rysunek"/>
+ <gentext key="Glossary" text="Glossary"/>
+ <gentext key="glossary" text="Glossary"/>
+ <gentext key="GlossSee" text="Patrz"/>
+ <gentext key="glosssee" text="Patrz"/>
+ <gentext key="GlossSeeAlso" text="Patrz te&#380;"/>
+ <gentext key="glossseealso" text="Patrz te&#380;"/>
+ <gentext key="Important" text="WA&#379;NE"/>
+ <gentext key="important" text="WA&#379;NE"/>
+ <gentext key="Index" text="Indeks"/>
+ <gentext key="index" text="Indeks"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="Odbiorcy"/>
+ <gentext key="msgaud" text="Odbiorcy"/>
+ <gentext key="MsgLevel" text="Poziom"/>
+ <gentext key="msglevel" text="Poziom"/>
+ <gentext key="MsgOrig" text="Nadawca"/>
+ <gentext key="msgorig" text="Nadawca"/>
+ <gentext key="Note" text="Notatka"/>
+ <gentext key="note" text="Notatka"/>
+ <gentext key="Part" text="Cz&#281;&#347;&#263;"/>
+ <gentext key="part" text="Cz&#281;&#347;&#263;"/>
+ <gentext key="Preface" text="Przedmowa"/>
+ <gentext key="preface" text="Przedmowa"/>
+ <gentext key="Procedure" text="Procedura"/>
+ <gentext key="procedure" text="Procedura"/>
+ <gentext key="Published" text="Data wydania"/>
+ <gentext key="published" text="Data wydania"/>
+ <gentext key="Question" text="Pyt:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Materia&#322;y &#378;r&#243;d&#322;owe"/>
+ <gentext key="reference" text="Materia&#322;y &#378;r&#243;d&#322;owe"/>
+ <gentext key="RefName" text="Nazwa"/>
+ <gentext key="refname" text="Nazwa"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="RevHistory" text="Historia zmian"/>
+ <gentext key="revhistory" text="Historia zmian"/>
+ <gentext key="Revision" text="Zmiana"/>
+ <gentext key="revision" text="Zmiana"/>
+ <gentext key="Section" text="Sekcja"/>
+ <gentext key="section" text="sekcja"/>
+ <gentext key="See" text="Patrz"/>
+ <gentext key="see" text="Patrz"/>
+ <gentext key="SeeAlso" text="Patrz te&#380;"/>
+ <gentext key="Seealso" text="Patrz te&#380;"/>
+ <gentext key="seealso" text="Patrz te&#380;"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Indeks"/>
+ <gentext key="setindex" text="Indeks"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="sidebar" text=""/>
+ <gentext key="Step" text="krok"/>
+ <gentext key="step" text="krok"/>
+ <gentext key="Table" text="Tabela"/>
+ <gentext key="table" text="Tabela"/>
+ <gentext key="Tip" text="Podpowied&#378;"/>
+ <gentext key="tip" text="Podpowied&#378;"/>
+ <gentext key="Warning" text="Ostrze&#191;enie"/>
+ <gentext key="warning" text="Ostrze&#191;enie"/>
+ <gentext key="TableofContents" text="Spis tre&#347;ci"/>
+ <gentext key="tableofcontents" text="Spis tre&#347;ci"/>
+ <gentext key="in" text="w"/>
+ <gentext key="by" text=""/>
+ <gentext key="Editedby" text="Redakcja: "/>
+ <gentext key="editedby" text="Redakcja: "/>
+ <gentext key="and" text="i"/>
+ <gentext key="Notes" text="Przypisy"/>
+ <gentext key="notes" text="Przypisy"/>
+ <gentext key="TableNotes" text="Przypisy"/>
+ <gentext key="tablenotes" text="Przypisy"/>
+ <gentext key="nonexistantelement" text="nie istniej&#261;cy element"/>
+ <gentext key="Pgs" text="stron"/>
+ <gentext key="pgs" text="stron"/>
+ <gentext key="unsupported" text="nie wspierany"/>
+ <gentext key="xrefto" text="xref to"/>
+ <gentext key="unexpectedelementname" text="Unexpected element name"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Spis tabel"/>
+ <gentext key="listoftables" text="Spis tabel"/>
+ <gentext key="ListofExamples" text="Spis przyk&#322;ad&#243;w"/>
+ <gentext key="listofexamples" text="Spis przyk&#322;ad&#243;w"/>
+ <gentext key="ListofFigures" text="Spis rysunk&#243;w"/>
+ <gentext key="listoffigures" text="Spis rysunk&#243;w"/>
+ <gentext key="ListofEquations" text="Spis r&#243;wna&#324;"/>
+ <gentext key="listofequations" text="Spis r&#243;wna&#324;"/>
+ <gentext key="ListofUnknown" text="Spis ???"/>
+ <gentext key="listofunknown" text="Spis ???"/>
+ <gentext key="nav-prev" text="Poprzedni"/>
+ <gentext key="nav-prev-sibling" text="Poprzedni rozdzia&#322;"/>
+ <gentext key="nav-next-sibling" text="Nast&#281;pny rozdzia&#322;"/>
+ <gentext key="nav-next" text="Nast&#234;pny"/>
+ <gentext key="nav-up" text="Pocz&#261;tek rozdzia&#322;u"/>
+ <gentext key="nav-home" text="Spis tre&#347;ci"/>
+ <dingbat key="startquote" text="&#8222;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#171;"/>
+ <dingbat key="nestedendquote" text="&#187;"/>
+ <dingbat key="bullet" text="&#2022;"/>
-<gentext key="ListofTables" text="Spis tabel"/>
-<gentext key="ListofExamples" text="Spis przyk&#179;ad&#243;w"/>
-<gentext key="ListofFigures" text="Spis rysunk&#243;w"/>
-<gentext key="ListofEquations" text="Spis r&#243;wna&#241;"/>
-<gentext key="ListofUnknown" text="Spis ???"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Dodatek %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Rozdzia&#322; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="R&#243;wnanie %n. %t"/>
+ <template name="example" text="Przyk&#322;ad %n. %t"/>
+ <template name="figure" text="Rysunek %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Cz&#281;&#347;&#263; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Poprzedni"/>
-<gentext key="nav-prev-sibling" text="Poprzedni rozdzia&#179;"/>
-<gentext key="nav-next-sibling" text="Nast&#234;pny rozdzia&#179;"/>
-<gentext key="nav-next" text="Nast&#234;pny"/>
-<gentext key="nav-up" text="Pocz&#177;tek rozdzia&#179;u"/>
-<gentext key="nav-home" text="Spis tre&#182;ci"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Dodatek %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Rozdzia&#322; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Przyk&#322;ad %n. %t"/>
+ <template name="figure" text="Rysunek %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Cz&#281;&#347;&#263; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Sekcja %n"/>
+ <template name="sect2" text="Sekcja %n"/>
+ <template name="sect3" text="Sekcja %n"/>
+ <template name="sect4" text="Sekcja %n"/>
+ <template name="sect5" text="Sekcja %n"/>
+ <template name="section" text="Sekcja %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" i "/>
+ <template name="seplast" text=", i "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Patrz "/>
+ <template name="seealso" text="Patrz te&#380; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Poziom: "/>
+ <template name="MsgOrig" text="Nadawca: "/>
+ <template name="MsgAud" text="Odbiorcy: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/pt.xml b/tests/docbook/common/pt.xml
index af0c22f4..f0de4c84 100644
--- a/tests/docbook/common/pt.xml
+++ b/tests/docbook/common/pt.xml
@@ -1,98 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="pt">
-<gentext key="abstract" text="Resumo"/>
-<gentext key="appendix" text="Ap&#234;ndice"/>
-<gentext key="article" text="Article"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Book"/>
-<gentext key="caution" text="CAUTELA"/>
-<gentext key="caution" text="Cautela"/>
-<gentext key="chapter" text="Cap&#237;tulo"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedicat&#243;ria"/>
-<gentext key="edition" text="Edi&#231;&#227;o"/>
-<gentext key="equation" text="Equa&#231;&#227;o"/>
-<gentext key="example" text="Exemplo"/>
-<gentext key="figure" text="Figura"/>
-<gentext key="glosssee" text="Ver"/>
-<gentext key="glossseealso" text="Ver Tamb&#233;m"/>
-<gentext key="glossary" text="Glossario"/>
-<gentext key="important" text="IMPORTANTE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Importante"/>
-<gentext key="index" text="Index"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text="Audi&#234;ncia"/>
-<gentext key="msglevel" text="N&#237;vel"/>
-<gentext key="msgorig" text="Origem"/>
-<gentext key="note" text="NOTA"/>
-<gentext key="note" text="Nota"/>
-<gentext key="part" text="Parte"/>
-<gentext key="preface" text="Pref&#225;cio"/>
-<gentext key="procedure" text="Procedimento"/>
-<gentext key="pubdate" text="Editado"/>
-<gentext key="published" text="Published"/>
-<gentext key="refname" text="Nome"/>
-<gentext key="reference" text="Refer&#234;ncia"/>
-<gentext key="revision" text="Revis&#227;o"/>
-<gentext key="revhistory" text="Hitorial de Revis&#245;es"/>
-<gentext key="section" text="Sec&#231;&#227;o"/>
-<gentext key="see" text="Ver"/>
-<gentext key="seealso" text="Ver Tamb&#233;m"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text="Sidebar"/>
-<gentext key="step" text="Passo"/>
-<gentext key="tip" text="DICA"/>
-<gentext key="table" text="Tabela"/>
-<gentext key="tip" text="Dica"/>
-<gentext key="warning" text="ATEN&#199;&#195;O"/>
-<gentext key="warning" text="Aten&#231;&#227;o"/>
-<gentext key="appendix" text="ap&#234;ndice"/>
-<gentext key="chapter" text="cap&#237;tulo"/>
-<gentext key="section" text="sec&#231;&#227;o"/>
-<gentext key="step" text="passo"/>
-<gentext key="seealso" text="ver tamb&#233;m"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="&#205;ndice"/>
-<gentext key="in" text=""/>
-<gentext key="by" text="por"/>
-<gentext key="Edited" text="Editado"/>
-<gentext key="Editedby" text="Editado por"/>
-<gentext key="and" text="e"/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="Pgs" text="P&#225;ginas"/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Resumo"/>
+ <gentext key="abstract" text="Resumo"/>
+ <gentext key="Answer" text="R:"/>
+ <gentext key="answer" text="R:"/>
+ <gentext key="Appendix" text="Ap&#234;ndice"/>
+ <gentext key="Article" text="Artigo"/>
+ <gentext key="article" text="Artigo"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Livro"/>
+ <gentext key="book" text="Livro"/>
+ <gentext key="CAUTION" text="CAUTELA"/>
+ <gentext key="caution" text="CAUTELA"/>
+ <gentext key="Caution" text="Cautela"/>
+ <gentext key="caution" text="Cautela"/>
+ <gentext key="Chapter" text="Cap&#237;tulo"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedicat&#243;ria"/>
+ <gentext key="dedication" text="Dedicat&#243;ria"/>
+ <gentext key="Edition" text="Edi&#231;&#227;o"/>
+ <gentext key="edition" text="Edi&#231;&#227;o"/>
+ <gentext key="Equation" text="Equa&#231;&#227;o"/>
+ <gentext key="equation" text="Equa&#231;&#227;o"/>
+ <gentext key="Example" text="Exemplo"/>
+ <gentext key="example" text="Exemplo"/>
+ <gentext key="Figure" text="Figura"/>
+ <gentext key="figure" text="Figura"/>
+ <gentext key="GlossSee" text="Ver"/>
+ <gentext key="glosssee" text="Ver"/>
+ <gentext key="GlossSeeAlso" text="Ver Tamb&#233;m"/>
+ <gentext key="glossseealso" text="Ver Tamb&#233;m"/>
+ <gentext key="Glossary" text="Glossario"/>
+ <gentext key="glossary" text="Glossario"/>
+ <gentext key="IMPORTANT" text="IMPORTANTE"/>
+ <gentext key="important" text="IMPORTANTE"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Importante"/>
+ <gentext key="important" text="Importante"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text="Audi&#234;ncia"/>
+ <gentext key="msgaud" text="Audi&#234;ncia"/>
+ <gentext key="MsgLevel" text="N&#237;vel"/>
+ <gentext key="msglevel" text="N&#237;vel"/>
+ <gentext key="MsgOrig" text="Origem"/>
+ <gentext key="msgorig" text="Origem"/>
+ <gentext key="NOTE" text="NOTA"/>
+ <gentext key="note" text="NOTA"/>
+ <gentext key="Note" text="Nota"/>
+ <gentext key="note" text="Nota"/>
+ <gentext key="Part" text="Parte"/>
+ <gentext key="part" text="Parte"/>
+ <gentext key="Preface" text="Pref&#225;cio"/>
+ <gentext key="preface" text="Pref&#225;cio"/>
+ <gentext key="Procedure" text="Procedimento"/>
+ <gentext key="procedure" text="Procedimento"/>
+ <gentext key="PubDate" text="Editado"/>
+ <gentext key="pubdate" text="Editado"/>
+ <gentext key="Published" text="Publicado"/>
+ <gentext key="published" text="Publicado"/>
+ <gentext key="Question" text="P:"/>
+ <gentext key="question" text="P:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Nome"/>
+ <gentext key="refname" text="Nome"/>
+ <gentext key="Reference" text="Refer&#234;ncia"/>
+ <gentext key="reference" text="Refer&#234;ncia"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Revis&#227;o"/>
+ <gentext key="revision" text="Revis&#227;o"/>
+ <gentext key="RevHistory" text="Hitorial de Revis&#245;es"/>
+ <gentext key="revhistory" text="Hitorial de Revis&#245;es"/>
+ <gentext key="Section" text="Sec&#231;&#227;o"/>
+ <gentext key="See" text="Ver"/>
+ <gentext key="see" text="Ver"/>
+ <gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+ <gentext key="seealso" text="Ver Tamb&#233;m"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text="Sidebar"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="Step" text="Passo"/>
+ <gentext key="TIP" text="DICA"/>
+ <gentext key="tip" text="DICA"/>
+ <gentext key="Table" text="Tabela"/>
+ <gentext key="table" text="Tabela"/>
+ <gentext key="Tip" text="Dica"/>
+ <gentext key="tip" text="Dica"/>
+ <gentext key="WARNING" text="ATEN&#199;&#195;O"/>
+ <gentext key="warning" text="ATEN&#199;&#195;O"/>
+ <gentext key="Warning" text="Aten&#231;&#227;o"/>
+ <gentext key="warning" text="Aten&#231;&#227;o"/>
+ <gentext key="appendix" text="ap&#234;ndice"/>
+ <gentext key="chapter" text="cap&#237;tulo"/>
+ <gentext key="section" text="sec&#231;&#227;o"/>
+ <gentext key="step" text="passo"/>
+ <gentext key="Seealso" text="ver tamb&#233;m"/>
+ <gentext key="seealso" text="ver tamb&#233;m"/>
+ <gentext key="TableofContents" text="&#205;ndice"/>
+ <gentext key="tableofcontents" text="&#205;ndice"/>
+ <gentext key="in" text=""/>
+ <gentext key="by" text="por"/>
+ <gentext key="Edited" text="Editado"/>
+ <gentext key="edited" text="Editado"/>
+ <gentext key="Editedby" text="Editado por"/>
+ <gentext key="editedby" text="Editado por"/>
+ <gentext key="and" text="e"/>
+ <gentext key="Notes" text="Notas"/>
+ <gentext key="notes" text="Notas"/>
+ <gentext key="TableNotes" text="Notas"/>
+ <gentext key="tablenotes" text="Notas"/>
+ <gentext key="nonexistantelement" text="non-existant element"/>
+ <gentext key="Pgs" text="P&#225;ginas"/>
+ <gentext key="pgs" text="P&#225;ginas"/>
+ <gentext key="unsupported" text="unsupported"/>
+ <gentext key="xrefto" text="xref to"/>
+ <gentext key="unexpectedelementname" text="Unexpected element name"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Lista de Tabelas"/>
+ <gentext key="listoftables" text="Lista de Tabelas"/>
+ <gentext key="ListofExamples" text="Lista de Exemplos"/>
+ <gentext key="listofexamples" text="Lista de Exemplos"/>
+ <gentext key="ListofFigures" text="Lista de Figuras"/>
+ <gentext key="listoffigures" text="Lista de Figuras"/>
+ <gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
+ <gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+ <gentext key="ListofUnknown" text="List of ???"/>
+ <gentext key="listofunknown" text="List of ???"/>
+ <gentext key="nav-prev" text="Prev"/>
+ <gentext key="nav-prev-sibling" text="Fast Backward"/>
+ <gentext key="nav-next-sibling" text="Fast Forward"/>
+ <gentext key="nav-next" text="Next"/>
+ <gentext key="nav-up" text="Up"/>
+ <gentext key="nav-home" text="Home"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Lista de Tabelas"/>
-<gentext key="ListofExamples" text="Lista de Exemplos"/>
-<gentext key="ListofFigures" text="Lista de Figuras"/>
-<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
-<gentext key="ListofUnknown" text="List of ???"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Ap&#234;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Equa&#231;&#227;o %n. %t"/>
+ <template name="example" text="Exemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Prev"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Ap&#234;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Sec&#231;&#227;o %n"/>
+ <template name="sect2" text="Sec&#231;&#227;o %n"/>
+ <template name="sect3" text="Sec&#231;&#227;o %n"/>
+ <template name="sect4" text="Sec&#231;&#227;o %n"/>
+ <template name="sect5" text="Sec&#231;&#227;o %n"/>
+ <template name="section" text="Sec&#231;&#227;o %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" e "/>
+ <template name="seplast" text=", e "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Ver "/>
+ <template name="seealso" text="Ver Tamb&#233;m "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="N&#237;vel: "/>
+ <template name="MsgOrig" text="Origem: "/>
+ <template name="MsgAud" text="Audi&#234;ncia: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/pt_br.xml b/tests/docbook/common/pt_br.xml
index cf63d1eb..1fe883ba 100644
--- a/tests/docbook/common/pt_br.xml
+++ b/tests/docbook/common/pt_br.xml
@@ -1,98 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="pt_br">
-<gentext key="abstract" text="Resumo"/>
-<gentext key="appendix" text="Ap&#234;ndice"/>
-<gentext key="article" text="Artigo"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Livro"/>
-<gentext key="caution" text="CUIDADO"/>
-<gentext key="caution" text="Cuidado"/>
-<gentext key="chapter" text="Cap&#237;tulo"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedicat&#243;ria"/>
-<gentext key="edition" text="Edi&#231;&#227;o"/>
-<gentext key="equation" text="Equa&#231;&#227;o"/>
-<gentext key="example" text="Exemplo"/>
-<gentext key="figure" text="Figura"/>
-<gentext key="glosssee" text="Ver"/>
-<gentext key="glossseealso" text="Ver Tamb&#233;m"/>
-<gentext key="glossary" text="Gloss&#225;rio"/>
-<gentext key="important" text="IMPORTANTE"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Importante"/>
-<gentext key="index" text="&#205;ndice Remissivo"/>
-<gentext key="legalnotice" text="Nota Legal"/>
-<gentext key="msgaud" text="Audi&#234;ncia"/>
-<gentext key="msglevel" text="N&#237;vel"/>
-<gentext key="msgorig" text="Origem"/>
-<gentext key="note" text="NOTA"/>
-<gentext key="note" text="Nota"/>
-<gentext key="part" text="Parte"/>
-<gentext key="preface" text="Pref&#225;cio"/>
-<gentext key="procedure" text="Procedimento"/>
-<gentext key="pubdate" text="Data de Publica&#231;&#227;o"/>
-<gentext key="published" text="Publicado"/>
-<gentext key="refname" text="Nome"/>
-<gentext key="reference" text="Refer&#234;ncia"/>
-<gentext key="revision" text="Revis&#227;o"/>
-<gentext key="revhistory" text="Hist&#243;rico de Revis&#245;es"/>
-<gentext key="section" text="Sec&#231;&#227;o"/>
-<gentext key="see" text="Ver"/>
-<gentext key="seealso" text="Ver Tamb&#233;m"/>
-<gentext key="set" text="Conjunto"/>
-<gentext key="setindex" text="&#205;ndice do Conjunto"/>
-<gentext key="sidebar" text="Quadro Lateral"/>
-<gentext key="step" text="Passo"/>
-<gentext key="tip" text="DICA"/>
-<gentext key="table" text="Tabela"/>
-<gentext key="tip" text="Dica"/>
-<gentext key="warning" text="ATEN&#199;&#195;O"/>
-<gentext key="warning" text="Aten&#231;&#227;o"/>
-<gentext key="appendix" text="ap&#234;ndice"/>
-<gentext key="chapter" text="cap&#237;tulo"/>
-<gentext key="section" text="sec&#231;&#227;o"/>
-<gentext key="step" text="passo"/>
-<gentext key="seealso" text="ver tamb&#233;m"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="&#205;ndice"/>
-<gentext key="in" text=""/>
-<gentext key="by" text="por"/>
-<gentext key="Edited" text="Editado"/>
-<gentext key="Editedby" text="Editado por"/>
-<gentext key="Revisedby" text="Revised by: "/> <!-- en -->
-<gentext key="and" text="e"/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="nonexistantelement" text="elemento inexistente"/>
-<gentext key="Pgs" text="P&#225;ginas"/>
-<gentext key="unsupported" text="n&#227;o suportado"/>
-<gentext key="xrefto" text="refer&#234;ncia para"/>
-<gentext key="unexpectedelementname" text="Nome de elemento inesperado"/>
+ <gentext key="Abstract" text="Resumo"/>
+ <gentext key="abstract" text="Resumo"/>
+ <gentext key="Answer" text="R:"/>
+ <gentext key="answer" text="R:"/>
+ <gentext key="Appendix" text="Ap&#234;ndice"/>
+ <gentext key="Article" text="Artigo"/>
+ <gentext key="article" text="Artigo"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Livro"/>
+ <gentext key="book" text="Livro"/>
+ <gentext key="CAUTION" text="CUIDADO"/>
+ <gentext key="caution" text="CUIDADO"/>
+ <gentext key="Caution" text="Cuidado"/>
+ <gentext key="caution" text="Cuidado"/>
+ <gentext key="Chapter" text="Cap&#237;tulo"/>
+ <gentext key="Colophon" text="Considera&#231;&#245;es finais"/>
+ <gentext key="colophon" text="Considera&#231;&#245;es finais"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedicat&#243;ria"/>
+ <gentext key="dedication" text="Dedicat&#243;ria"/>
+ <gentext key="Edition" text="Edi&#231;&#227;o"/>
+ <gentext key="edition" text="Edi&#231;&#227;o"/>
+ <gentext key="Equation" text="Equa&#231;&#227;o"/>
+ <gentext key="equation" text="Equa&#231;&#227;o"/>
+ <gentext key="Example" text="Exemplo"/>
+ <gentext key="example" text="Exemplo"/>
+ <gentext key="Figure" text="Figura"/>
+ <gentext key="figure" text="Figura"/>
+ <gentext key="GlossSee" text="Ver"/>
+ <gentext key="glosssee" text="Ver"/>
+ <gentext key="GlossSeeAlso" text="Ver Tamb&#233;m"/>
+ <gentext key="glossseealso" text="Ver Tamb&#233;m"/>
+ <gentext key="Glossary" text="Gloss&#225;rio"/>
+ <gentext key="glossary" text="Gloss&#225;rio"/>
+ <gentext key="IMPORTANT" text="IMPORTANTE"/>
+ <gentext key="important" text="IMPORTANTE"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Importante"/>
+ <gentext key="important" text="Importante"/>
+ <gentext key="Index" text="&#205;ndice Remissivo"/>
+ <gentext key="index" text="&#205;ndice Remissivo"/>
+ <gentext key="LegalNotice" text="Nota Legal"/>
+ <gentext key="legalnotice" text="Nota Legal"/>
+ <gentext key="MsgAud" text="Audi&#234;ncia"/>
+ <gentext key="msgaud" text="Audi&#234;ncia"/>
+ <gentext key="MsgLevel" text="N&#237;vel"/>
+ <gentext key="msglevel" text="N&#237;vel"/>
+ <gentext key="MsgOrig" text="Origem"/>
+ <gentext key="msgorig" text="Origem"/>
+ <gentext key="NOTE" text="NOTA"/>
+ <gentext key="note" text="NOTA"/>
+ <gentext key="Note" text="Nota"/>
+ <gentext key="note" text="Nota"/>
+ <gentext key="Part" text="Parte"/>
+ <gentext key="part" text="Parte"/>
+ <gentext key="Preface" text="Pref&#225;cio"/>
+ <gentext key="preface" text="Pref&#225;cio"/>
+ <gentext key="Procedure" text="Procedimento"/>
+ <gentext key="procedure" text="Procedimento"/>
+ <gentext key="PubDate" text="Data de Publica&#231;&#227;o"/>
+ <gentext key="pubdate" text="Data de Publica&#231;&#227;o"/>
+ <gentext key="Published" text="Publicado"/>
+ <gentext key="published" text="Publicado"/>
+ <gentext key="Question" text="P:"/>
+ <gentext key="question" text="P:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Nome"/>
+ <gentext key="refname" text="Nome"/>
+ <gentext key="Reference" text="Refer&#234;ncia"/>
+ <gentext key="reference" text="Refer&#234;ncia"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Sinopse"/>
+ <gentext key="refsynopsisdiv" text="Sinopse"/>
+ <gentext key="Revision" text="Revis&#227;o"/>
+ <gentext key="revision" text="Revis&#227;o"/>
+ <gentext key="RevHistory" text="Hist&#243;rico de Revis&#245;es"/>
+ <gentext key="revhistory" text="Hist&#243;rico de Revis&#245;es"/>
+ <gentext key="Section" text="Se&#231;&#227;o"/>
+ <gentext key="See" text="Ver"/>
+ <gentext key="see" text="Ver"/>
+ <gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+ <gentext key="seealso" text="Ver Tamb&#233;m"/>
+ <gentext key="Set" text="Conjunto"/>
+ <gentext key="set" text="Conjunto"/>
+ <gentext key="SetIndex" text="&#205;ndice do Conjunto"/>
+ <gentext key="setindex" text="&#205;ndice do Conjunto"/>
+ <gentext key="Sidebar" text="Quadro Lateral"/>
+ <gentext key="sidebar" text="quadro lateral"/>
+ <gentext key="Step" text="Passo"/>
+ <gentext key="TIP" text="DICA"/>
+ <gentext key="tip" text="DICA"/>
+ <gentext key="Table" text="Tabela"/>
+ <gentext key="table" text="Tabela"/>
+ <gentext key="Tip" text="Dica"/>
+ <gentext key="tip" text="Dica"/>
+ <gentext key="WARNING" text="ATEN&#199;&#195;O"/>
+ <gentext key="warning" text="ATEN&#199;&#195;O"/>
+ <gentext key="Warning" text="Aten&#231;&#227;o"/>
+ <gentext key="warning" text="Aten&#231;&#227;o"/>
+ <gentext key="appendix" text="ap&#234;ndice"/>
+ <gentext key="chapter" text="cap&#237;tulo"/>
+ <gentext key="section" text="se&#231;&#227;o"/>
+ <gentext key="step" text="passo"/>
+ <gentext key="Seealso" text="ver tamb&#233;m"/>
+ <gentext key="seealso" text="ver tamb&#233;m"/>
+ <gentext key="TableofContents" text="&#205;ndice"/>
+ <gentext key="tableofcontents" text="&#205;ndice"/>
+ <gentext key="in" text=""/>
+ <gentext key="by" text="por"/>
+ <gentext key="Edited" text="Editado"/>
+ <gentext key="edited" text="Editado"/>
+ <gentext key="Editedby" text="Editado por"/>
+ <gentext key="editedby" text="Editado por"/>
+ <gentext key="Revisedby" text="Revisado por: "/>
+ <gentext key="revisedby" text="Revisado por: "/>
+ <gentext key="and" text="e"/>
+ <gentext key="Notes" text="Notas"/>
+ <gentext key="notes" text="Notas"/>
+ <gentext key="TableNotes" text="Notas"/>
+ <gentext key="tablenotes" text="Notas"/>
+ <gentext key="nonexistantelement" text="elemento inexistente"/>
+ <gentext key="Pgs" text="P&#225;ginas"/>
+ <gentext key="pgs" text="P&#225;ginas"/>
+ <gentext key="unsupported" text="n&#227;o suportado"/>
+ <gentext key="xrefto" text="refer&#234;ncia para"/>
+ <gentext key="unexpectedelementname" text="Nome de elemento inesperado"/>
+ <gentext key="ListofTables" text="Lista de Tabelas"/>
+ <gentext key="listoftables" text="Lista de Tabelas"/>
+ <gentext key="ListofExamples" text="Lista de Exemplos"/>
+ <gentext key="listofexamples" text="Lista de Exemplos"/>
+ <gentext key="ListofFigures" text="Lista de Figuras"/>
+ <gentext key="listoffigures" text="Lista de Figuras"/>
+ <gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
+ <gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+ <gentext key="ListofUnknown" text="Lista de ???"/>
+ <gentext key="listofunknown" text="Lista de ???"/>
+ <gentext key="nav-prev" text="Anterior"/>
+ <gentext key="nav-prev-sibling" text="In&#237;cio"/>
+ <gentext key="nav-next-sibling" text="Fim"/>
+ <gentext key="nav-next" text="Pr&#243;xima"/>
+ <gentext key="nav-up" text="Acima"/>
+ <gentext key="nav-home" text="Principal"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Lista de Tabelas"/>
-<gentext key="ListofExamples" text="Lista de Exemplos"/>
-<gentext key="ListofFigures" text="Lista de Figuras"/>
-<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
-<gentext key="ListofUnknown" text="Lista de ???"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Ap&#234;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Equa&#231;&#227;o %n. %t"/>
+ <template name="example" text="Exemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Anterior"/>
-<gentext key="nav-prev-sibling" text="In&#237;cio"/>
-<gentext key="nav-next-sibling" text="Fim"/>
-<gentext key="nav-next" text="Pr&#243;xima"/>
-<gentext key="nav-up" text="Acima"/>
-<gentext key="nav-home" text="Principal"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Ap&#234;ndice %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Cap&#237;tulo %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exemplo %n. %t"/>
+ <template name="figure" text="Figura %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Se&#231;&#227;o %n"/>
+ <template name="sect2" text="Se&#231;&#227;o %n"/>
+ <template name="sect3" text="Se&#231;&#227;o %n"/>
+ <template name="sect4" text="Se&#231;&#227;o %n"/>
+ <template name="sect5" text="Se&#231;&#227;o %n"/>
+ <template name="section" text="Se&#231;&#227;o %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" e "/>
+ <template name="seplast" text=", e "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Ver "/>
+ <template name="seealso" text="Ver Tamb&#233;m "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="N&#237;vel: "/>
+ <template name="MsgOrig" text="Origem: "/>
+ <template name="MsgAud" text="Audi&#234;ncia: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/ro.xml b/tests/docbook/common/ro.xml
index a59ffd82..0fa4070d 100644
--- a/tests/docbook/common/ro.xml
+++ b/tests/docbook/common/ro.xml
@@ -1,104 +1,343 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="ro">
-<gentext key="abstract" text="Rezumat"/>
-<gentext key="appendix" text="Anexa"/>
-<gentext key="article" text="Articol"/>
-<gentext key="bibliography" text="Bibliografie"/>
-<gentext key="book" text="Carte"/>
-<gentext key="caution" text="ATEN&#222;IE"/>
-<gentext key="caution" text="Aten&#254;ie"/>
-<gentext key="chapter" text="Cap."/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedica&#254;ie"/>
-<gentext key="edition" text="Edi&#254;ie"/>
-<gentext key="equation" text="ecua&#254;ia"/>
-<gentext key="example" text="Exemplu"/>
-<gentext key="figure" text="Fig."/>
-<gentext key="glossary" text="Glosar"/>
-<gentext key="glosssee" text="Vezi"/>
-<gentext key="glossseealso" text="Vezi &#x015F;i"/>
-<gentext key="important" text="IMPORTANT"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Important"/>
-<gentext key="index" text="Index"/>
-<gentext key="legalnotice" text=""/>
-<gentext key="msgaud" text=""/>
-<gentext key="msglevel" text="Nivel"/>
-<gentext key="msgorig" text="Origine"/>
-<gentext key="note" text="NOT&#195;"/>
-<gentext key="note" text="Not&#227;"/>
-<gentext key="refname" text="Nume"/>
-<gentext key="note" text="Not&#227;"/>
-<gentext key="part" text="Parte"/>
-<gentext key="preface" text="Prefa&#254;&#227;"/>
-<gentext key="procedure" text="Procedur&#227;"/>
-<gentext key="published" text="Publicat"/>
-<gentext key="reference" text="Referin&#254;&#227;"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Referin&#254;&#227;"/>
-<gentext key="refname" text="Name"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="Rezumat"/>
-<gentext key="revision" text="Versiune"/>
-<gentext key="revhistory" text="Istoricul versiunilor"/>
-<gentext key="section" text="Sec&#254;iune"/>
-<gentext key="see" text="Vezi"/>
-<gentext key="seealso" text="Vezi &#x015F;i"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Opera&#254;ie"/>
-<gentext key="tip" text="INDICA&#222;IE"/>
-<gentext key="table" text="Tabel"/>
-<gentext key="tip" text="Indica&#254;ie"/>
-<gentext key="warning" text="AVERTISMENT"/>
-<gentext key="warning" text="Avertisment"/>
-<gentext key="appendix" text="anexa"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="chapter" text="cap."/>
-<gentext key="section" text="sec."/>
-<gentext key="step" text="opera&#254;iune"/>
-<gentext key="seealso" text="Vezi &#x015F;i"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Cuprins"/>
-<gentext key="in" text="&#x00EE;n"/>
-<gentext key="by" text="de"/>
-<gentext key="Edited" text="Publicat"/>
-<gentext key="Editedby" text="Publicat de"/>
-<gentext key="and" text="&#x015F;i"/>
-<gentext key="Notes" text="Note"/>
-<gentext key="TableNotes" text="Remarci"/>
-<gentext key="nonexistantelement" text="element inexistent"/>
-<gentext key="Pgs" text="Pagini"/>
-<gentext key="unsupported" text="nerecunoscut de sisitem"/>
-<gentext key="xrefto" text="referin&#254;&#227; c&#227;tre"/>
-<gentext key="unexpectedelementname" text="Nume de element nea&#x015F;teptat"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Rezumat"/>
+ <gentext key="abstract" text="Rezumat"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Anexa"/>
+ <gentext key="Article" text="Articol"/>
+ <gentext key="article" text="Articol"/>
+ <gentext key="Bibliography" text="Bibliografie"/>
+ <gentext key="bibliography" text="Bibliografie"/>
+ <gentext key="Book" text="Carte"/>
+ <gentext key="book" text="Carte"/>
+ <gentext key="CAUTION" text="ATEN&#222;IE"/>
+ <gentext key="caution" text="ATEN&#222;IE"/>
+ <gentext key="Caution" text="Aten&#254;ie"/>
+ <gentext key="caution" text="Aten&#254;ie"/>
+ <gentext key="Chapter" text="Cap."/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedica&#254;ie"/>
+ <gentext key="dedication" text="Dedica&#254;ie"/>
+ <gentext key="Edition" text="Edi&#254;ie"/>
+ <gentext key="edition" text="Edi&#254;ie"/>
+ <gentext key="Equation" text="ecua&#254;ia"/>
+ <gentext key="equation" text="ecua&#254;ia"/>
+ <gentext key="Example" text="Exemplu"/>
+ <gentext key="example" text="Exemplu"/>
+ <gentext key="Figure" text="Fig."/>
+ <gentext key="figure" text="Fig."/>
+ <gentext key="Glossary" text="Glosar"/>
+ <gentext key="glossary" text="Glosar"/>
+ <gentext key="GlossSee" text="Vezi"/>
+ <gentext key="glosssee" text="Vezi"/>
+ <gentext key="GlossSeeAlso" text="Vezi &#351;i"/>
+ <gentext key="glossseealso" text="Vezi &#351;i"/>
+ <gentext key="IMPORTANT" text="IMPORTANT"/>
+ <gentext key="important" text="IMPORTANT"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Important"/>
+ <gentext key="important" text="Important"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text=""/>
+ <gentext key="legalnotice" text=""/>
+ <gentext key="MsgAud" text=""/>
+ <gentext key="msgaud" text=""/>
+ <gentext key="MsgLevel" text="Nivel"/>
+ <gentext key="msglevel" text="Nivel"/>
+ <gentext key="MsgOrig" text="Origine"/>
+ <gentext key="msgorig" text="Origine"/>
+ <gentext key="NOTE" text="NOT&#195;"/>
+ <gentext key="note" text="NOT&#195;"/>
+ <gentext key="Note" text="Not&#227;"/>
+ <gentext key="note" text="Not&#227;"/>
+ <gentext key="RefName" text="Nume"/>
+ <gentext key="refname" text="Nume"/>
+ <gentext key="Note" text="Not&#227;"/>
+ <gentext key="note" text="Not&#227;"/>
+ <gentext key="Part" text="Parte"/>
+ <gentext key="part" text="Parte"/>
+ <gentext key="Preface" text="Prefa&#254;&#227;"/>
+ <gentext key="preface" text="Prefa&#254;&#227;"/>
+ <gentext key="Procedure" text="Procedur&#227;"/>
+ <gentext key="procedure" text="Procedur&#227;"/>
+ <gentext key="Published" text="Publicat"/>
+ <gentext key="published" text="Publicat"/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="Reference" text="Referin&#254;&#227;"/>
+ <gentext key="reference" text="Referin&#254;&#227;"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Referin&#254;&#227;"/>
+ <gentext key="reference" text="Referin&#254;&#227;"/>
+ <gentext key="RefName" text="Name"/>
+ <gentext key="refname" text="Name"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Rezumat"/>
+ <gentext key="refsynopsisdiv" text="Rezumat"/>
+ <gentext key="Revision" text="Versiune"/>
+ <gentext key="revision" text="Versiune"/>
+ <gentext key="RevHistory" text="Istoricul versiunilor"/>
+ <gentext key="revhistory" text="Istoricul versiunilor"/>
+ <gentext key="Section" text="Sec&#254;iune"/>
+ <gentext key="See" text="Vezi"/>
+ <gentext key="see" text="Vezi"/>
+ <gentext key="SeeAlso" text="Vezi &#351;i"/>
+ <gentext key="seealso" text="Vezi &#351;i"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Index"/>
+ <gentext key="setindex" text="Index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Opera&#254;ie"/>
+ <gentext key="TIP" text="INDICA&#222;IE"/>
+ <gentext key="tip" text="INDICA&#222;IE"/>
+ <gentext key="Table" text="Tabel"/>
+ <gentext key="table" text="Tabel"/>
+ <gentext key="Tip" text="Indica&#254;ie"/>
+ <gentext key="tip" text="Indica&#254;ie"/>
+ <gentext key="WARNING" text="AVERTISMENT"/>
+ <gentext key="warning" text="AVERTISMENT"/>
+ <gentext key="Warning" text="Avertisment"/>
+ <gentext key="warning" text="Avertisment"/>
+ <gentext key="appendix" text="anexa"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="chapter" text="cap."/>
+ <gentext key="section" text="sec."/>
+ <gentext key="step" text="opera&#254;iune"/>
+ <gentext key="Seealso" text="Vezi &#351;i"/>
+ <gentext key="seealso" text="Vezi &#351;i"/>
+ <gentext key="TableofContents" text="Cuprins"/>
+ <gentext key="tableofcontents" text="Cuprins"/>
+ <gentext key="in" text="&#238;n"/>
+ <gentext key="by" text="de"/>
+ <gentext key="Edited" text="Publicat"/>
+ <gentext key="edited" text="Publicat"/>
+ <gentext key="Editedby" text="Publicat de"/>
+ <gentext key="editedby" text="Publicat de"/>
+ <gentext key="and" text="&#351;i"/>
+ <gentext key="Notes" text="Note"/>
+ <gentext key="notes" text="Note"/>
+ <gentext key="TableNotes" text="Remarci"/>
+ <gentext key="tablenotes" text="Remarci"/>
+ <gentext key="nonexistantelement" text="element inexistent"/>
+ <gentext key="Pgs" text="Pagini"/>
+ <gentext key="pgs" text="Pagini"/>
+ <gentext key="unsupported" text="nerecunoscut de sisitem"/>
+ <gentext key="xrefto" text="referin&#254;&#227; c&#227;tre"/>
+ <gentext key="unexpectedelementname" text="Nume de element nea&#351;teptat"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="List&#227; de tabele"/>
+ <gentext key="listoftables" text="List&#227; de tabele"/>
+ <gentext key="ListofExamples" text="List&#227; de exemple"/>
+ <gentext key="listofexamples" text="List&#227; de exemple"/>
+ <gentext key="ListofFigures" text="List&#227; de figuri"/>
+ <gentext key="listoffigures" text="List&#227; de figuri"/>
+ <gentext key="ListofEquations" text="List&#227; de ecua&#254;ii"/>
+ <gentext key="listofequations" text="List&#227; de ecua&#254;ii"/>
+ <gentext key="ListofUnknown" text="List&#227; de necunoscute"/>
+ <gentext key="listofunknown" text="List&#227; de necunoscute"/>
+ <gentext key="nav-prev" text="&#206;napoi"/>
+ <gentext key="nav-prev-sibling" text="Repede &#238;napoi"/>
+ <gentext key="nav-next-sibling" text="Repede &#239;nainte"/>
+ <gentext key="nav-next" text="&#206;nainte"/>
+ <gentext key="nav-up" text="Sus"/>
+ <gentext key="nav-home" text="Acas&#227;"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="List&#227; de tabele"/>
-<gentext key="ListofExamples" text="List&#227; de exemple"/>
-<gentext key="ListofFigures" text="List&#227; de figuri"/>
-<gentext key="ListofEquations" text="List&#227; de ecua&#254;ii"/>
-<gentext key="ListofUnknown" text="List&#227; de necunoscute"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Anexa %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Cap. %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="ecua&#254;ia %n. %t"/>
+ <template name="example" text="Exemplu %n. %t"/>
+ <template name="figure" text="Fig. %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Prev"/>
-<gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
-<gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Anexa %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Cap. %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exemplu %n. %t"/>
+ <template name="figure" text="Fig. %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Parte %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabel %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Sec&#254;iune %n"/>
+ <template name="sect2" text="Sec&#254;iune %n"/>
+ <template name="sect3" text="Sec&#254;iune %n"/>
+ <template name="sect4" text="Sec&#254;iune %n"/>
+ <template name="sect5" text="Sec&#254;iune %n"/>
+ <template name="section" text="Sec&#254;iune %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#351;i "/>
+ <template name="seplast" text=", &#351;i "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Vezi "/>
+ <template name="seealso" text="Vezi &#351;i "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Nivel: "/>
+ <template name="MsgOrig" text="Origine: "/>
+ <template name="MsgAud" text=": "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/ru.xml b/tests/docbook/common/ru.xml
index a097cd41..d1210d56 100644
--- a/tests/docbook/common/ru.xml
+++ b/tests/docbook/common/ru.xml
@@ -1,113 +1,366 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="ru">
-<gentext key="abstract" text="&#x0410;&#x043D;&#x043D;&#x043E;&#x0442;&#x0430;&#x0446;&#x0438;&#x044F;"/>
-<gentext key="appendix" text="&#x041F;&#x0440;&#x0438;&#x043B;&#x043E;&#x0436;&#x0435;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="appendix.abr" text="&#x041F;&#x0440;&#x0438;&#x043B;."/>
-<gentext key="article" text="&#x0421;&#x0442;&#x0430;&#x0442;&#x044C;&#x044F;"/>
-<gentext key="audience" text="&#x0410;&#x0443;&#x0434;&#x0438;&#x0442;&#x043E;&#x0440;&#x0438;&#x044F;"/>
-<gentext key="bibliography" text="&#x041B;&#x0438;&#x0442;&#x0435;&#x0440;&#x0430;&#x0442;&#x0443;&#x0440;&#x0430;"/>
-<gentext key="book" text="&#x041A;&#x043D;&#x0438;&#x0433;&#x0430;"/>
-<gentext key="caution" text="&#x041F;&#x0420;&#x0415;&#x0414;&#x041E;&#x0421;&#x0422;&#x0415;&#x0420;&#x0415;&#x0416;&#x0415;&#x041D;&#x0418;&#x0415;"/>
-<gentext key="caution" text="&#x041F;&#x0440;&#x0435;&#x0434;&#x043E;&#x0441;&#x0442;&#x0435;&#x0440;&#x0435;&#x0436;&#x0435;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="chapter" text="&#x0413;&#x043B;&#x0430;&#x0432;&#x0430;"/>
-<gentext key="chapter.abr" text="&#x0413;&#x043B;."/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="&#x041F;&#x043E;&#x0441;&#x0432;&#x044F;&#x0449;&#x0435;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="edition" text="&#x0420;&#x0435;&#x0434;&#x0430;&#x043A;&#x0446;&#x0438;&#x044F;"/>
-<gentext key="equation" text="&#x0424;&#x043E;&#x0440;&#x043C;&#x0443;&#x043B;&#x0430;"/>
-<gentext key="equation.abr" text="&#x0424;."/>
-<gentext key="example" text="&#x041F;&#x0440;&#x0438;&#x043C;&#x0435;&#x0440;"/>
-<gentext key="example.abr" text="&#x041F;&#x0440;&#x0438;&#x043C;."/>
-<gentext key="figure" text="&#x0420;&#x0438;&#x0441;&#x0443;&#x043D;&#x043E;&#x043A;"/>
-<gentext key="figure.abr" text="&#x0420;&#x0438;&#x0441;."/>
-<gentext key="glossary" text="&#x0413;&#x043B;&#x043E;&#x0441;&#x0441;&#x0430;&#x0440;&#x0438;&#x0439;"/>
-<gentext key="important" text="&#x0412;&#x0410;&#x0416;&#x041D;&#x041E;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="&#x0412;&#x0430;&#x0436;&#x043D;&#x043E;"/>
-<gentext key="index" text="&#x041F;&#x0440;&#x0435;&#x0434;&#x043C;&#x0435;&#x0442;&#x043D;&#x044B;&#x0439; &#x0443;&#x043A;&#x0430;&#x0437;&#x0430;&#x0442;&#x0435;&#x043B;&#x044C;"/>
-<gentext key="legalnotice" text="&#x0410;&#x0432;&#x0442;&#x043E;&#x0440;&#x0441;&#x043A;&#x0438;&#x0435; &#x043F;&#x0440;&#x0430;&#x0432;&#x0430;"/>
-<gentext key="level" text="&#x0423;&#x0440;&#x043E;&#x0432;&#x0435;&#x043D;&#x044C;"/>
-<gentext key="note" text="&#x0417;&#x0410;&#x041C;&#x0415;&#x0427;&#x0410;&#x041D;&#x0418;&#x0415;"/>
-<gentext key="name" text="&#x0418;&#x043C;&#x044F;"/>
-<gentext key="note" text="&#x0417;&#x0430;&#x043C;&#x0435;&#x0447;&#x0430;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="origin" text="&#x0418;&#x0441;&#x0442;&#x043E;&#x0447;&#x043D;&#x0438;&#x043A;"/>
-<gentext key="part" text="&#x0427;&#x0430;&#x0441;&#x0442;&#x044C;"/>
-<gentext key="part.abr" text="&#x0427;."/>
-<gentext key="preface" text="&#x041F;&#x0440;&#x0435;&#x0434;&#x0438;&#x0441;&#x043B;&#x043E;&#x0432;&#x0438;&#x0435;"/>
-<gentext key="procedure" text="&#x041F;&#x0440;&#x043E;&#x0446;&#x0435;&#x0434;&#x0443;&#x0440;&#x0430;"/>
-<gentext key="procedure.abr" text="&#x041F;&#x0440;&#x043E;&#x0446;."/>
-<gentext key="published" text="&#x041E;&#x043F;&#x0443;&#x0431;&#x043B;&#x0438;&#x043A;&#x043E;&#x0432;&#x0430;&#x043D;&#x043E;"/>
-<gentext key="reference" text="&#x0421;&#x0441;&#x044B;&#x043B;&#x043A;&#x0430;"/>
-<gentext key="revision" text="&#x0418;&#x0437;&#x0434;&#x0430;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="history" text="&#x0418;&#x0441;&#x0442;&#x043E;&#x0440;&#x0438;&#x044F;"/>
-<gentext key="revisionhistory" text="&#x0418;&#x0441;&#x0442;&#x043E;&#x0440;&#x0438;&#x044F; &#x043F;&#x0435;&#x0440;&#x0435;&#x0438;&#x0437;&#x0434;&#x0430;&#x043D;&#x0438;&#x044F;"/>
-<gentext key="section" text="&#x0420;&#x0430;&#x0437;&#x0434;&#x0435;&#x043B;"/>
-<gentext key="section.abr" text="&#x0420;&#x0430;&#x0437;&#x0434;."/>
-<gentext key="see" text="&#x0421;&#x043C;."/>
-<gentext key="seealso" text="&#x0421;&#x043C;. &#x0442;&#x0430;&#x043A;&#x0436;&#x0435;"/>
-<gentext key="seealso" text="&#x0421;&#x043C;. &#x0442;&#x0430;&#x043A;&#x0436;&#x0435;"/>
-<gentext key="set" text="&#x041F;&#x043E;&#x0434;&#x0431;&#x043E;&#x0440;&#x043A;&#x0430;"/>
-<gentext key="setindex" text="&#x0418;&#x043D;&#x0434;&#x0435;&#x043A;&#x0441; &#x043F;&#x043E;&#x0434;&#x0431;&#x043E;&#x0440;&#x043A;&#x0438;"/>
-<gentext key="sidebar" text="&#x0412;&#x044B;&#x0434;&#x0435;&#x043B;&#x0435;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="step" text="&#x0428;&#x0430;&#x0433;"/>
-<gentext key="tip" text="&#x041F;&#x041E;&#x0414;&#x0421;&#x041A;&#x0410;&#x0417;&#x041A;&#x0410;"/>
-<gentext key="table" text="&#x0422;&#x0430;&#x0431;&#x043B;&#x0438;&#x0446;&#x0430;"/>
-<gentext key="table.abr" text="&#x0422;&#x0430;&#x0431;&#x043B;."/>
-<gentext key="tip" text="&#x041F;&#x043E;&#x0434;&#x0441;&#x043A;&#x0430;&#x0437;&#x043A;&#x0430;"/>
-<gentext key="warning" text="&#x0412;&#x041D;&#x0418;&#x041C;&#x0410;&#x041D;&#x0418;&#x0415;"/>
-<gentext key="warning" text="&#x0412;&#x043D;&#x0438;&#x043C;&#x0430;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="appendix" text="&#x043F;&#x0440;&#x0438;&#x043B;&#x043E;&#x0436;&#x0435;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="chapter" text="&#x0433;&#x043B;&#x0430;&#x0432;&#x0430;"/>
-<gentext key="section" text="&#x0440;&#x0430;&#x0437;&#x0434;&#x0435;&#x043B;"/>
-<gentext key="step" text="&#x0448;&#x0430;&#x0433;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="&#x0421;&#x043E;&#x0434;&#x0435;&#x0440;&#x0436;&#x0430;&#x043D;&#x0438;&#x0435;"/>
-<gentext key="called" text=""/>
-<gentext key="in" text="&#x0432;"/>
-<gentext key="by" text=""/>
-<gentext key="Edited" text="&#x041F;&#x043E;&#x0434; &#x0440;&#x0435;&#x0434;&#x0430;&#x043A;&#x0446;&#x0438;&#x0435;&#x0439;"/>
-<gentext key="Editedby" text="&#x041F;&#x043E;&#x0434; &#x0440;&#x0435;&#x0434;&#x0430;&#x043A;&#x0446;&#x0438;&#x0435;&#x0439;"/>
-<gentext key="and" text=""/>
-<!-- the list of author names, but "and" in such
- lists of Russian books is not traditionally
- used (I. Kouznetsov) -->
-<gentext key="Notes" text="&#x041F;&#x0440;&#x0438;&#x043C;&#x0435;&#x0447;&#x0430;&#x043D;&#x0438;&#x044F;"/>
-<gentext key="TableNotes" text="&#x041F;&#x0440;&#x0438;&#x043C;&#x0435;&#x0447;&#x0430;&#x043D;&#x0438;&#x044F;"/>
+ <gentext key="Abstract" text="&#1040;&#1085;&#1085;&#1086;&#1090;&#1072;&#1094;&#1080;&#1103;"/>
+ <gentext key="abstract" text="&#1040;&#1085;&#1085;&#1086;&#1090;&#1072;&#1094;&#1080;&#1103;"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="&#1055;&#1088;&#1080;&#1083;&#1086;&#1078;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="Appendix.abr" text="&#1055;&#1088;&#1080;&#1083;."/>
+ <gentext key="appendix.abr" text="&#1055;&#1088;&#1080;&#1083;."/>
+ <gentext key="Article" text="&#1057;&#1090;&#1072;&#1090;&#1100;&#1103;"/>
+ <gentext key="article" text="&#1057;&#1090;&#1072;&#1090;&#1100;&#1103;"/>
+ <gentext key="Audience" text="&#1040;&#1091;&#1076;&#1080;&#1090;&#1086;&#1088;&#1080;&#1103;"/>
+ <gentext key="audience" text="&#1040;&#1091;&#1076;&#1080;&#1090;&#1086;&#1088;&#1080;&#1103;"/>
+ <gentext key="Bibliography" text="&#1051;&#1080;&#1090;&#1077;&#1088;&#1072;&#1090;&#1091;&#1088;&#1072;"/>
+ <gentext key="bibliography" text="&#1051;&#1080;&#1090;&#1077;&#1088;&#1072;&#1090;&#1091;&#1088;&#1072;"/>
+ <gentext key="Book" text="&#1050;&#1085;&#1080;&#1075;&#1072;"/>
+ <gentext key="book" text="&#1050;&#1085;&#1080;&#1075;&#1072;"/>
+ <gentext key="CAUTION" text="&#1055;&#1056;&#1045;&#1044;&#1054;&#1057;&#1058;&#1045;&#1056;&#1045;&#1046;&#1045;&#1053;&#1048;&#1045;"/>
+ <gentext key="caution" text="&#1055;&#1056;&#1045;&#1044;&#1054;&#1057;&#1058;&#1045;&#1056;&#1045;&#1046;&#1045;&#1053;&#1048;&#1045;"/>
+ <gentext key="Caution" text="&#1055;&#1088;&#1077;&#1076;&#1086;&#1089;&#1090;&#1077;&#1088;&#1077;&#1078;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="caution" text="&#1055;&#1088;&#1077;&#1076;&#1086;&#1089;&#1090;&#1077;&#1088;&#1077;&#1078;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="Chapter" text="&#1043;&#1083;&#1072;&#1074;&#1072;"/>
+ <gentext key="Chapter.abr" text="&#1043;&#1083;."/>
+ <gentext key="chapter.abr" text="&#1043;&#1083;."/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="&#1055;&#1086;&#1089;&#1074;&#1103;&#1097;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="dedication" text="&#1055;&#1086;&#1089;&#1074;&#1103;&#1097;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="Edition" text="&#1056;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1103;"/>
+ <gentext key="edition" text="&#1056;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1103;"/>
+ <gentext key="Equation" text="&#1060;&#1086;&#1088;&#1084;&#1091;&#1083;&#1072;"/>
+ <gentext key="equation" text="&#1060;&#1086;&#1088;&#1084;&#1091;&#1083;&#1072;"/>
+ <gentext key="Equation.abr" text="&#1060;."/>
+ <gentext key="equation.abr" text="&#1060;."/>
+ <gentext key="Example" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1088;"/>
+ <gentext key="example" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1088;"/>
+ <gentext key="Example.abr" text="&#1055;&#1088;&#1080;&#1084;."/>
+ <gentext key="example.abr" text="&#1055;&#1088;&#1080;&#1084;."/>
+ <gentext key="Figure" text="&#1056;&#1080;&#1089;&#1091;&#1085;&#1086;&#1082;"/>
+ <gentext key="figure" text="&#1056;&#1080;&#1089;&#1091;&#1085;&#1086;&#1082;"/>
+ <gentext key="Figure.abr" text="&#1056;&#1080;&#1089;."/>
+ <gentext key="figure.abr" text="&#1056;&#1080;&#1089;."/>
+ <gentext key="GlossSee" text="See"/>
+ <gentext key="glosssee" text="See"/>
+ <gentext key="GlossSeeAlso" text="See Also"/>
+ <gentext key="glossseealso" text="See Also"/>
+ <gentext key="Glossary" text="&#1043;&#1083;&#1086;&#1089;&#1089;&#1072;&#1088;&#1080;&#1081;"/>
+ <gentext key="glossary" text="&#1043;&#1083;&#1086;&#1089;&#1089;&#1072;&#1088;&#1080;&#1081;"/>
+ <gentext key="IMPORTANT" text="&#1042;&#1040;&#1046;&#1053;&#1054;"/>
+ <gentext key="important" text="&#1042;&#1040;&#1046;&#1053;&#1054;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="&#1042;&#1072;&#1078;&#1085;&#1086;"/>
+ <gentext key="important" text="&#1042;&#1072;&#1078;&#1085;&#1086;"/>
+ <gentext key="Index" text="&#1055;&#1088;&#1077;&#1076;&#1084;&#1077;&#1090;&#1085;&#1099;&#1081; &#1091;&#1082;&#1072;&#1079;&#1072;&#1090;&#1077;&#1083;&#1100;"/>
+ <gentext key="index" text="&#1055;&#1088;&#1077;&#1076;&#1084;&#1077;&#1090;&#1085;&#1099;&#1081; &#1091;&#1082;&#1072;&#1079;&#1072;&#1090;&#1077;&#1083;&#1100;"/>
+ <gentext key="LegalNotice" text="&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080;&#1077; &#1087;&#1088;&#1072;&#1074;&#1072;"/>
+ <gentext key="legalnotice" text="&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080;&#1077; &#1087;&#1088;&#1072;&#1074;&#1072;"/>
+ <gentext key="Level" text="&#1059;&#1088;&#1086;&#1074;&#1077;&#1085;&#1100;"/>
+ <gentext key="level" text="&#1059;&#1088;&#1086;&#1074;&#1077;&#1085;&#1100;"/>
+ <gentext key="MsgAud" text="Audience"/>
+ <gentext key="msgaud" text="Audience"/>
+ <gentext key="MsgLevel" text="Level"/>
+ <gentext key="msglevel" text="Level"/>
+ <gentext key="MsgOrig" text="Origin"/>
+ <gentext key="msgorig" text="Origin"/>
+ <gentext key="NOTE" text="&#1047;&#1040;&#1052;&#1045;&#1063;&#1040;&#1053;&#1048;&#1045;"/>
+ <gentext key="note" text="&#1047;&#1040;&#1052;&#1045;&#1063;&#1040;&#1053;&#1048;&#1045;"/>
+ <gentext key="Name" text="&#1048;&#1084;&#1103;"/>
+ <gentext key="name" text="&#1048;&#1084;&#1103;"/>
+ <gentext key="Note" text="&#1047;&#1072;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="note" text="&#1047;&#1072;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="Origin" text="&#1048;&#1089;&#1090;&#1086;&#1095;&#1085;&#1080;&#1082;"/>
+ <gentext key="origin" text="&#1048;&#1089;&#1090;&#1086;&#1095;&#1085;&#1080;&#1082;"/>
+ <gentext key="Part" text="&#1063;&#1072;&#1089;&#1090;&#1100;"/>
+ <gentext key="part" text="&#1063;&#1072;&#1089;&#1090;&#1100;"/>
+ <gentext key="Part.abr" text="&#1063;."/>
+ <gentext key="part.abr" text="&#1063;."/>
+ <gentext key="Preface" text="&#1055;&#1088;&#1077;&#1076;&#1080;&#1089;&#1083;&#1086;&#1074;&#1080;&#1077;"/>
+ <gentext key="preface" text="&#1055;&#1088;&#1077;&#1076;&#1080;&#1089;&#1083;&#1086;&#1074;&#1080;&#1077;"/>
+ <gentext key="Procedure" text="&#1055;&#1088;&#1086;&#1094;&#1077;&#1076;&#1091;&#1088;&#1072;"/>
+ <gentext key="procedure" text="&#1055;&#1088;&#1086;&#1094;&#1077;&#1076;&#1091;&#1088;&#1072;"/>
+ <gentext key="Procedure.abr" text="&#1055;&#1088;&#1086;&#1094;."/>
+ <gentext key="procedure.abr" text="&#1055;&#1088;&#1086;&#1094;."/>
+ <gentext key="Published" text="&#1054;&#1087;&#1091;&#1073;&#1083;&#1080;&#1082;&#1086;&#1074;&#1072;&#1085;&#1086;"/>
+ <gentext key="published" text="&#1054;&#1087;&#1091;&#1073;&#1083;&#1080;&#1082;&#1086;&#1074;&#1072;&#1085;&#1086;"/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="&#1057;&#1089;&#1099;&#1083;&#1082;&#1072;"/>
+ <gentext key="reference" text="&#1057;&#1089;&#1099;&#1083;&#1082;&#1072;"/>
+ <gentext key="RefName" text="Name"/>
+ <gentext key="refname" text="Name"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="&#1048;&#1079;&#1076;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="revision" text="&#1048;&#1079;&#1076;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="RevHistory" text="&#1048;&#1089;&#1090;&#1086;&#1088;&#1080;&#1103; &#1087;&#1077;&#1088;&#1077;&#1080;&#1079;&#1076;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="revhistory" text="&#1048;&#1089;&#1090;&#1086;&#1088;&#1080;&#1103; &#1087;&#1077;&#1088;&#1077;&#1080;&#1079;&#1076;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="Section" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083;"/>
+ <gentext key="Section.abr" text="&#1056;&#1072;&#1079;&#1076;."/>
+ <gentext key="section.abr" text="&#1056;&#1072;&#1079;&#1076;."/>
+ <gentext key="See" text="&#1057;&#1084;."/>
+ <gentext key="see" text="&#1057;&#1084;."/>
+ <gentext key="SeeAlso" text="&#1057;&#1084;. &#1090;&#1072;&#1082;&#1078;&#1077;"/>
+ <gentext key="seealso" text="&#1057;&#1084;. &#1090;&#1072;&#1082;&#1078;&#1077;"/>
+ <gentext key="Seealso" text="&#1057;&#1084;. &#1090;&#1072;&#1082;&#1078;&#1077;"/>
+ <gentext key="seealso" text="&#1057;&#1084;. &#1090;&#1072;&#1082;&#1078;&#1077;"/>
+ <gentext key="Set" text="&#1055;&#1086;&#1076;&#1073;&#1086;&#1088;&#1082;&#1072;"/>
+ <gentext key="set" text="&#1055;&#1086;&#1076;&#1073;&#1086;&#1088;&#1082;&#1072;"/>
+ <gentext key="SetIndex" text="&#1048;&#1085;&#1076;&#1077;&#1082;&#1089; &#1087;&#1086;&#1076;&#1073;&#1086;&#1088;&#1082;&#1080;"/>
+ <gentext key="setindex" text="&#1048;&#1085;&#1076;&#1077;&#1082;&#1089; &#1087;&#1086;&#1076;&#1073;&#1086;&#1088;&#1082;&#1080;"/>
+ <gentext key="Sidebar" text="&#1042;&#1099;&#1076;&#1077;&#1083;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="sidebar" text="&#1074;&#1099;&#1076;&#1077;&#1083;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="Step" text="&#1064;&#1072;&#1075;"/>
+ <gentext key="TIP" text="&#1055;&#1054;&#1044;&#1057;&#1050;&#1040;&#1047;&#1050;&#1040;"/>
+ <gentext key="tip" text="&#1055;&#1054;&#1044;&#1057;&#1050;&#1040;&#1047;&#1050;&#1040;"/>
+ <gentext key="Table" text="&#1058;&#1072;&#1073;&#1083;&#1080;&#1094;&#1072;"/>
+ <gentext key="table" text="&#1058;&#1072;&#1073;&#1083;&#1080;&#1094;&#1072;"/>
+ <gentext key="Table.abr" text="&#1058;&#1072;&#1073;&#1083;."/>
+ <gentext key="table.abr" text="&#1058;&#1072;&#1073;&#1083;."/>
+ <gentext key="Tip" text="&#1055;&#1086;&#1076;&#1089;&#1082;&#1072;&#1079;&#1082;&#1072;"/>
+ <gentext key="tip" text="&#1055;&#1086;&#1076;&#1089;&#1082;&#1072;&#1079;&#1082;&#1072;"/>
+ <gentext key="WARNING" text="&#1042;&#1053;&#1048;&#1052;&#1040;&#1053;&#1048;&#1045;"/>
+ <gentext key="warning" text="&#1042;&#1053;&#1048;&#1052;&#1040;&#1053;&#1048;&#1045;"/>
+ <gentext key="Warning" text="&#1042;&#1085;&#1080;&#1084;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="warning" text="&#1042;&#1085;&#1080;&#1084;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="appendix" text="&#1087;&#1088;&#1080;&#1083;&#1086;&#1078;&#1077;&#1085;&#1080;&#1077;"/>
+ <gentext key="chapter" text="&#1075;&#1083;&#1072;&#1074;&#1072;"/>
+ <gentext key="section" text="&#1088;&#1072;&#1079;&#1076;&#1077;&#1083;"/>
+ <gentext key="step" text="&#1096;&#1072;&#1075;"/>
+ <gentext key="TableofContents" text="&#1057;&#1086;&#1076;&#1077;&#1088;&#1078;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="tableofcontents" text="&#1057;&#1086;&#1076;&#1077;&#1088;&#1078;&#1072;&#1085;&#1080;&#1077;"/>
+ <gentext key="called" text=""/>
+ <gentext key="in" text="&#1074;"/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="&#1055;&#1086;&#1076; &#1088;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1077;&#1081;"/>
+ <gentext key="edited" text="&#1055;&#1086;&#1076; &#1088;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1077;&#1081;"/>
+ <gentext key="Editedby" text="&#1055;&#1086;&#1076; &#1088;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1077;&#1081;"/>
+ <gentext key="editedby" text="&#1055;&#1086;&#1076; &#1088;&#1077;&#1076;&#1072;&#1082;&#1094;&#1080;&#1077;&#1081;"/>
+ <gentext key="and" text=""/>
+ <gentext key="Notes" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="notes" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="TableNotes" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="tablenotes" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1095;&#1072;&#1085;&#1080;&#1103;"/>
+ <gentext key="nonexistantelement" text="non-existant element"/>
+ <gentext key="the" text=""/>
+ <gentext key="Pgs" text="&#1057;&#1090;&#1088;."/>
+ <gentext key="pgs" text="&#1057;&#1090;&#1088;."/>
+ <gentext key="unsupported" text="unsupported"/>
+ <gentext key="xrefto" text="xref to"/>
+ <gentext key="unexpectedelementname" text="unexpected element name"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1090;&#1072;&#1073;&#1083;&#1080;&#1094;"/>
+ <gentext key="listoftables" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1090;&#1072;&#1073;&#1083;&#1080;&#1094;"/>
+ <gentext key="ListofExamples" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1087;&#1088;&#1080;&#1084;&#1077;&#1088;&#1086;&#1074;"/>
+ <gentext key="listofexamples" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1087;&#1088;&#1080;&#1084;&#1077;&#1088;&#1086;&#1074;"/>
+ <gentext key="ListofFigures" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1080;&#1083;&#1083;&#1102;&#1089;&#1090;&#1088;&#1072;&#1094;&#1080;&#1081;"/>
+ <gentext key="listoffigures" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1080;&#1083;&#1083;&#1102;&#1089;&#1090;&#1088;&#1072;&#1094;&#1080;&#1081;"/>
+ <gentext key="ListofEquations" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1092;&#1086;&#1088;&#1084;&#1091;&#1083;"/>
+ <gentext key="listofequations" text="&#1057;&#1087;&#1080;&#1089;&#1086;&#1082; &#1092;&#1086;&#1088;&#1084;&#1091;&#1083;"/>
+ <gentext key="ListofUnknown" text="&#1053;&#1077;&#1086;&#1087;&#1088;&#1077;&#1076;&#1077;&#1083;&#1077;&#1085;&#1085;&#1099;&#1081; &#1089;&#1087;&#1080;&#1089;&#1086;&#1082;"/>
+ <gentext key="listofunknown" text="&#1053;&#1077;&#1086;&#1087;&#1088;&#1077;&#1076;&#1077;&#1083;&#1077;&#1085;&#1085;&#1099;&#1081; &#1089;&#1087;&#1080;&#1089;&#1086;&#1082;"/>
+ <gentext key="nav-prev" text="&#1055;&#1088;&#1077;&#1076;."/>
+ <gentext key="nav-prev-sibling" text="&#1055;&#1088;&#1077;&#1076;. &#1087;&#1086;&#1076;&#1088;&#1072;&#1079;&#1076;&#1077;&#1083;"/>
+ <gentext key="nav-next-sibling" text="&#1057;&#1083;&#1077;&#1076;. &#1087;&#1086;&#1076;&#1088;&#1072;&#1079;&#1076;&#1077;&#1083;"/>
+ <gentext key="x-nav-next" text="&#1057;&#1083;&#1077;&#1076;."/>
+ <gentext key="nav-next" text="&#1057;&#1083;&#1077;&#1076;."/>
+ <gentext key="nav-up" text="&#1059;&#1088;&#1086;&#1074;&#1077;&#1085;&#1100; &#1074;&#1099;&#1096;&#1077;"/>
+ <gentext key="nav-home" text="&#1053;&#1072;&#1095;&#1072;&#1083;&#1086;"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<!-- Suggestion of I. Kouznetsov: Error messages are better in English -->
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#1055;&#1088;&#1080;&#1083;&#1086;&#1078;&#1077;&#1085;&#1080;&#1077; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="&#1043;&#1083;&#1072;&#1074;&#1072; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#1060;&#1086;&#1088;&#1084;&#1091;&#1083;&#1072; %n. %t"/>
+ <template name="example" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1088; %n. %t"/>
+ <template name="figure" text="&#1056;&#1080;&#1089;&#1091;&#1085;&#1086;&#1082; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#1063;&#1072;&#1089;&#1090;&#1100; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#1058;&#1072;&#1073;&#1083;&#1080;&#1094;&#1072; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="the" text=""/>
-<gentext key="Pgs" text="&#x0421;&#x0442;&#x0440;."/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="unexpected element name"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<gentext key="ListofTables" text="&#x0421;&#x043F;&#x0438;&#x0441;&#x043E;&#x043A; &#x0442;&#x0430;&#x0431;&#x043B;&#x0438;&#x0446;"/>
-<gentext key="ListofExamples" text="&#x0421;&#x043F;&#x0438;&#x0441;&#x043E;&#x043A; &#x043F;&#x0440;&#x0438;&#x043C;&#x0435;&#x0440;&#x043E;&#x0432;"/>
-<gentext key="ListofFigures" text="&#x0421;&#x043F;&#x0438;&#x0441;&#x043E;&#x043A; &#x0438;&#x043B;&#x043B;&#x044E;&#x0441;&#x0442;&#x0440;&#x0430;&#x0446;&#x0438;&#x0439;"/>
-<gentext key="ListofEquations" text="&#x0421;&#x043F;&#x0438;&#x0441;&#x043E;&#x043A; &#x0444;&#x043E;&#x0440;&#x043C;&#x0443;&#x043B;"/>
-<gentext key="ListofUnknown" text="&#x041D;&#x0435;&#x043E;&#x043F;&#x0440;&#x0435;&#x0434;&#x0435;&#x043B;&#x0435;&#x043D;&#x043D;&#x044B;&#x0439; &#x0441;&#x043F;&#x0438;&#x0441;&#x043E;&#x043A;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<gentext key="nav-prev" text="&#x041F;&#x0440;&#x0435;&#x0434;."/>
-<gentext key="nav-prev-sibling" text="&#x041F;&#x0440;&#x0435;&#x0434;. &#x041F;&#x043E;&#x0434;&#x0440;&#x0430;&#x0437;&#x0434;&#x0435;&#x043B;"/>
-<gentext key="nav-next-sibling" text="&#x0421;&#x043B;&#x0435;&#x0434;. &#x041F;&#x043E;&#x0434;&#x0440;&#x0430;&#x0437;&#x0434;&#x0435;&#x043B;"/>
-<gentext key="nav-next" text="&#x0421;&#x043B;&#x0435;&#x0434;."/>
-<gentext key="nav-up" text="&#x0423;&#x0440;&#x043E;&#x0432;&#x0435;&#x043D;&#x044C; &#x0432;&#x044B;&#x0448;&#x0435;"/>
-<gentext key="nav-home" text="&#x043D;&#x0430;&#x0447;&#x0430;&#x043B;&#x043E;"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="xref">
+ <template name="appendix" text="&#1055;&#1088;&#1080;&#1083;&#1086;&#1078;&#1077;&#1085;&#1080;&#1077; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="&#1043;&#1083;&#1072;&#1074;&#1072; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#1055;&#1088;&#1080;&#1084;&#1077;&#1088; %n. %t"/>
+ <template name="figure" text="&#1056;&#1080;&#1089;&#1091;&#1085;&#1086;&#1082; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#1063;&#1072;&#1089;&#1090;&#1100; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#1058;&#1072;&#1073;&#1083;&#1080;&#1094;&#1072; %n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+ <context name="section-xref-numbered">
+ <template name="sect1" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="sect2" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="sect3" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="sect4" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="sect5" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="section" text="&#1056;&#1072;&#1079;&#1076;&#1077;&#1083; %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" "/>
+ <template name="seplast" text=", "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="See "/>
+ <template name="seealso" text="See Also "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Level: "/>
+ <template name="MsgOrig" text="Origin: "/>
+ <template name="MsgAud" text="Audience: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/sk.xml b/tests/docbook/common/sk.xml
index 0c2fbc85..0039f175 100644
--- a/tests/docbook/common/sk.xml
+++ b/tests/docbook/common/sk.xml
@@ -1,104 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="sk">
-<gentext key="abstract" text="Obsah"/>
-<gentext key="answer" text="A:"/>
-<gentext key="appendix" text="Dodatok"/>
-<gentext key="article" text="&#x010C;l&#x00E1;nok"/>
-<gentext key="bibliography" text="Bibliografia"/>
-<gentext key="book" text="Kniha"/>
-<gentext key="caution" text="V&#x00DD;STRAHA"/>
-<gentext key="caution" text="V&#x00FD;straha"/>
-<gentext key="chapter" text="Kapitola"/>
-<gentext key="colophon" text="Tir&#x00E1;&#x017E;"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Venovanie"/>
-<gentext key="edition" text="Vydanie"/>
-<gentext key="equation" text="Rovnice"/>
-<gentext key="example" text="Pr&#x00ED;klad"/>
-<gentext key="figure" text="Obr&#x00E1;zok"/>
-<gentext key="glosssee" text="Pozri"/>
-<gentext key="glossseealso" text="Pozri tie&#x017E;"/>
-<gentext key="glossary" text="Slovn&#x00ED;k"/>
-<gentext key="important" text="D&#x00D4;LE&#x017D;IT&#x00C9;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="D&#x00F4;le&#x017E;it&#x00E9;"/>
-<gentext key="index" text="Zoznam"/>
-<gentext key="legalnotice" text="Pr&#x00E1;vna pozn&#x00E1;mka"/>
-<gentext key="msgaud" text="Publikum"/>
-<gentext key="msglevel" text="&#x00DA;rove&#x0148;"/>
-<gentext key="msgorig" text="P&#x00F4;vod"/>
-<gentext key="note" text="POZN&#x00C1;MKA"/>
-<gentext key="note" text="Pozn&#x00E1;mka"/>
-<gentext key="part" text="&#x010C;as&#x0165;"/>
-<gentext key="preface" text="&#x00DA;vod"/>
-<gentext key="procedure" text="Postup"/>
-<gentext key="published" text="Vydan&#x00E9;"/>
-<gentext key="question" text="Q:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Odkaz"/>
-<gentext key="refname" text="Meno"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="Preh&#x013E;ad"/>
-<gentext key="revision" text="Rev&#x00ED;zia"/>
-<gentext key="revhistory" text="Preh&#x013E;ad rev&#x00ED;zi&#x00ED;"/>
-<gentext key="section" text="Oddiel"/>
-<gentext key="see" text="Pozri"/>
-<gentext key="seealso" text="Pozri tie&#x017E;"/>
-<gentext key="set" text="Nastavi&#x0165;"/>
-<gentext key="setindex" text="Nastavi&#x0165; index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Krok"/>
-<gentext key="tip" text="TIP"/>
-<gentext key="table" text="Tabu&#x013E;ka"/>
-<gentext key="tip" text="Tip"/>
-<gentext key="warning" text="VAROVANIE"/>
-<gentext key="warning" text="Varovanie"/>
-<gentext key="appendix" text="dodatok"/>
-<gentext key="chapter" text="kapitola"/>
-<gentext key="section" text="oddiel"/>
-<gentext key="sidebar" text="bo&#x010D;n&#x00ED; li&#x0161;ta"/>
-<gentext key="step" text="krok"/>
-<gentext key="seealso" text="Pozri tie&#x017E;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Obsah"/>
-<gentext key="in" text="v"/>
-<gentext key="by" text=""/>
-<gentext key="Edited" text="Vydan&#x00E9;"/>
-<gentext key="Editedby" text="Vydan&#x00E9;"/>
-<gentext key="and" text="a"/>
-<gentext key="Notes" text="Pozn&#x00E1;mky"/>
-<gentext key="TableNotes" text="Pozn&#x00E1;mky"/>
-<gentext key="nonexistantelement" text="neexistuj&#x00FA;ci prvok"/>
-<gentext key="Pgs" text="Str."/>
-<gentext key="unsupported" text="nepodporovan&#x00FD;"/>
-<gentext key="xrefto" text="xref k"/>
-<gentext key="unexpectedelementname" text="Neo&#x010D;ak&#x00E1;van&#x00E9; meno prvku"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Obsah"/>
+ <gentext key="abstract" text="Obsah"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Dodatok"/>
+ <gentext key="Article" text="&#268;l&#225;nok"/>
+ <gentext key="article" text="&#268;l&#225;nok"/>
+ <gentext key="Bibliography" text="Bibliografia"/>
+ <gentext key="bibliography" text="Bibliografia"/>
+ <gentext key="Book" text="Kniha"/>
+ <gentext key="book" text="Kniha"/>
+ <gentext key="CAUTION" text="V&#221;STRAHA"/>
+ <gentext key="caution" text="V&#221;STRAHA"/>
+ <gentext key="Caution" text="V&#253;straha"/>
+ <gentext key="caution" text="V&#253;straha"/>
+ <gentext key="Chapter" text="Kapitola"/>
+ <gentext key="Colophon" text="Tir&#225;&#382;"/>
+ <gentext key="colophon" text="Tir&#225;&#382;"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Venovanie"/>
+ <gentext key="dedication" text="Venovanie"/>
+ <gentext key="Edition" text="Vydanie"/>
+ <gentext key="edition" text="Vydanie"/>
+ <gentext key="Equation" text="Rovnice"/>
+ <gentext key="equation" text="Rovnice"/>
+ <gentext key="Example" text="Pr&#237;klad"/>
+ <gentext key="example" text="Pr&#237;klad"/>
+ <gentext key="Figure" text="Obr&#225;zok"/>
+ <gentext key="figure" text="Obr&#225;zok"/>
+ <gentext key="GlossSee" text="Pozri"/>
+ <gentext key="glosssee" text="Pozri"/>
+ <gentext key="GlossSeeAlso" text="Pozri tie&#382;"/>
+ <gentext key="glossseealso" text="Pozri tie&#382;"/>
+ <gentext key="Glossary" text="Slovn&#237;k"/>
+ <gentext key="glossary" text="Slovn&#237;k"/>
+ <gentext key="IMPORTANT" text="D&#212;LE&#381;IT&#201;"/>
+ <gentext key="important" text="D&#212;LE&#381;IT&#201;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="D&#244;le&#382;it&#233;"/>
+ <gentext key="important" text="D&#244;le&#382;it&#233;"/>
+ <gentext key="Index" text="Zoznam"/>
+ <gentext key="index" text="Zoznam"/>
+ <gentext key="LegalNotice" text="Pr&#225;vna pozn&#225;mka"/>
+ <gentext key="legalnotice" text="Pr&#225;vna pozn&#225;mka"/>
+ <gentext key="MsgAud" text="Publikum"/>
+ <gentext key="msgaud" text="Publikum"/>
+ <gentext key="MsgLevel" text="&#218;rove&#328;"/>
+ <gentext key="msglevel" text="&#218;rove&#328;"/>
+ <gentext key="MsgOrig" text="P&#244;vod"/>
+ <gentext key="msgorig" text="P&#244;vod"/>
+ <gentext key="NOTE" text="POZN&#193;MKA"/>
+ <gentext key="note" text="POZN&#193;MKA"/>
+ <gentext key="Note" text="Pozn&#225;mka"/>
+ <gentext key="note" text="Pozn&#225;mka"/>
+ <gentext key="Part" text="&#268;as&#357;"/>
+ <gentext key="part" text="&#268;as&#357;"/>
+ <gentext key="Preface" text="&#218;vod"/>
+ <gentext key="preface" text="&#218;vod"/>
+ <gentext key="Procedure" text="Postup"/>
+ <gentext key="procedure" text="Postup"/>
+ <gentext key="Published" text="Vydan&#233;"/>
+ <gentext key="published" text="Vydan&#233;"/>
+ <gentext key="Question" text="Q:"/>
+ <gentext key="question" text="Q:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Odkaz"/>
+ <gentext key="reference" text="Odkaz"/>
+ <gentext key="RefName" text="Meno"/>
+ <gentext key="refname" text="Meno"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Preh&#318;ad"/>
+ <gentext key="refsynopsisdiv" text="Preh&#318;ad"/>
+ <gentext key="Revision" text="Rev&#237;zia"/>
+ <gentext key="revision" text="Rev&#237;zia"/>
+ <gentext key="RevHistory" text="Preh&#318;ad rev&#237;zi&#237;"/>
+ <gentext key="revhistory" text="Preh&#318;ad rev&#237;zi&#237;"/>
+ <gentext key="Section" text="Oddiel"/>
+ <gentext key="See" text="Pozri"/>
+ <gentext key="see" text="Pozri"/>
+ <gentext key="SeeAlso" text="Pozri tie&#382;"/>
+ <gentext key="seealso" text="Pozri tie&#382;"/>
+ <gentext key="Set" text="Nastavi&#357;"/>
+ <gentext key="set" text="Nastavi&#357;"/>
+ <gentext key="SetIndex" text="Nastavi&#357; index"/>
+ <gentext key="setindex" text="Nastavi&#357; index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Krok"/>
+ <gentext key="TIP" text="TIP"/>
+ <gentext key="tip" text="TIP"/>
+ <gentext key="Table" text="Tabu&#318;ka"/>
+ <gentext key="table" text="Tabu&#318;ka"/>
+ <gentext key="Tip" text="Tip"/>
+ <gentext key="tip" text="Tip"/>
+ <gentext key="WARNING" text="VAROVANIE"/>
+ <gentext key="warning" text="VAROVANIE"/>
+ <gentext key="Warning" text="Varovanie"/>
+ <gentext key="warning" text="Varovanie"/>
+ <gentext key="appendix" text="dodatok"/>
+ <gentext key="chapter" text="kapitola"/>
+ <gentext key="section" text="oddiel"/>
+ <gentext key="sidebar" text="bo&#269;n&#237; li&#353;ta"/>
+ <gentext key="step" text="krok"/>
+ <gentext key="Seealso" text="Pozri tie&#382;"/>
+ <gentext key="seealso" text="Pozri tie&#382;"/>
+ <gentext key="TableofContents" text="Obsah"/>
+ <gentext key="tableofcontents" text="Obsah"/>
+ <gentext key="in" text="v"/>
+ <gentext key="by" text=""/>
+ <gentext key="Edited" text="Vydan&#233;"/>
+ <gentext key="edited" text="Vydan&#233;"/>
+ <gentext key="Editedby" text="Vydan&#233;"/>
+ <gentext key="editedby" text="Vydan&#233;"/>
+ <gentext key="and" text="a"/>
+ <gentext key="Notes" text="Pozn&#225;mky"/>
+ <gentext key="notes" text="Pozn&#225;mky"/>
+ <gentext key="TableNotes" text="Pozn&#225;mky"/>
+ <gentext key="tablenotes" text="Pozn&#225;mky"/>
+ <gentext key="nonexistantelement" text="neexistuj&#250;ci prvok"/>
+ <gentext key="Pgs" text="Str."/>
+ <gentext key="pgs" text="Str."/>
+ <gentext key="unsupported" text="nepodporovan&#253;"/>
+ <gentext key="xrefto" text="xref k"/>
+ <gentext key="unexpectedelementname" text="Neo&#269;ak&#225;van&#233; meno prvku"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Zoznam tabuliek"/>
+ <gentext key="listoftables" text="Zoznam tabuliek"/>
+ <gentext key="ListofExamples" text="Zoznam pr&#237;kladov"/>
+ <gentext key="listofexamples" text="Zoznam pr&#237;kladov"/>
+ <gentext key="ListofFigures" text="Zoznam obr&#225;zkov"/>
+ <gentext key="listoffigures" text="Zoznam obr&#225;zkov"/>
+ <gentext key="ListofEquations" text="Zoznam rovn&#237;c"/>
+ <gentext key="listofequations" text="Zoznam rovn&#237;c"/>
+ <gentext key="ListofUnknown" text="Zoznam nezn&#225;meho"/>
+ <gentext key="listofunknown" text="Zoznam nezn&#225;meho"/>
+ <gentext key="nav-prev" text="Predch&#225;dzaj&#250;ci"/>
+ <gentext key="nav-prev-sibling" text="R&#253;chlo nazp&#228;t"/>
+ <gentext key="nav-next-sibling" text="R&#253;chlo dopredu"/>
+ <gentext key="nav-next" text="&#270;al&#353;&#237;"/>
+ <gentext key="nav-up" text="Hore"/>
+ <gentext key="nav-home" text="Domov"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Zoznam tabuliek"/>
-<gentext key="ListofExamples" text="Zoznam pr&#x00ED;kladov"/>
-<gentext key="ListofFigures" text="Zoznam obr&#x00E1;zkov"/>
-<gentext key="ListofEquations" text="Zoznam rovn&#x00ED;c"/>
-<gentext key="ListofUnknown" text="Zoznam nezn&#x00E1;meho"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Dodatok %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapitola %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Rovnice %n. %t"/>
+ <template name="example" text="Pr&#237;klad %n. %t"/>
+ <template name="figure" text="Obr&#225;zok %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#268;as&#357; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabu&#318;ka %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Predch&#x00E1;dzaj&#x00FA;ci"/>
-<gentext key="nav-prev-sibling" text="R&#x00FD;chlo nazp&#x00E4;t"/>
-<gentext key="nav-next-sibling" text="R&#x00FD;chlo dopredu"/>
-<gentext key="nav-next" text="&#x010E;al&#x0161;&#x00ED;"/>
-<gentext key="nav-up" text="Hore"/>
-<gentext key="nav-home" text="Domov"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Dodatok %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Kapitola %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Pr&#237;klad %n. %t"/>
+ <template name="figure" text="Obr&#225;zok %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#268;as&#357; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabu&#318;ka %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Oddiel %n"/>
+ <template name="sect2" text="Oddiel %n"/>
+ <template name="sect3" text="Oddiel %n"/>
+ <template name="sect4" text="Oddiel %n"/>
+ <template name="sect5" text="Oddiel %n"/>
+ <template name="section" text="Oddiel %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" a "/>
+ <template name="seplast" text=", a "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Pozri "/>
+ <template name="seealso" text="Pozri tie&#382; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#218;rove&#328;: "/>
+ <template name="MsgOrig" text="P&#244;vod: "/>
+ <template name="MsgAud" text="Publikum: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/sl.xml b/tests/docbook/common/sl.xml
index fca0f5e3..a5eaf15f 100644
--- a/tests/docbook/common/sl.xml
+++ b/tests/docbook/common/sl.xml
@@ -1,104 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="sl">
-<gentext key="abstract" text="Povzetek"/>
-<gentext key="answer" text="O:"/>
-<gentext key="appendix" text="Dodatek"/>
-<gentext key="article" text="&#x010C;lanek"/>
-<gentext key="bibliography" text="Literatura"/>
-<gentext key="book" text="Knjiga"/>
-<gentext key="caution" text="OPOZORILO"/>
-<gentext key="caution" text="Opozorilo"/>
-<gentext key="chapter" text="Poglavje"/>
-<gentext key="colophon" text="Kolofon"/>
-<gentext key="copyright" text="Pravna za&#x0161;&#x010D;ita"/>
-<gentext key="dedication" text="Posvetilo"/>
-<gentext key="edition" text="Izdaja"/>
-<gentext key="equation" text="Ena&#x010D;ba"/>
-<gentext key="example" text="Primer"/>
-<gentext key="figure" text="Slika"/>
-<gentext key="glosssee" text="glej"/>
-<gentext key="glossseealso" text="glej tudi"/>
-<gentext key="glossary" text="Slovar&#x010D;ek"/>
-<gentext key="important" text="POMEMBNO"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Pomembno"/>
-<gentext key="index" text="Stvarno kazalo"/>
-<gentext key="legalnotice" text="Pravno sporo&#x010D;ilo"/>
-<gentext key="msgaud" text="Ob&#x010D;instvo"/>
-<gentext key="msglevel" text="Raven"/>
-<gentext key="msgorig" text="Izvor"/>
-<gentext key="note" text="OPOMBA"/>
-<gentext key="note" text="Opomba"/>
-<gentext key="part" text="Del"/>
-<gentext key="preface" text="Predgovor"/>
-<gentext key="procedure" text="Postopek"/>
-<gentext key="published" text="Izdano"/>
-<gentext key="question" text="V:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="Sklic"/>
-<gentext key="refname" text="Ime"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="Sinopsis"/>
-<gentext key="revision" text="Razli&#x010D;ica"/>
-<gentext key="revhistory" text="Zgodovina razli&#x010D;ic"/>
-<gentext key="section" text="Razdelek"/>
-<gentext key="see" text="glej"/>
-<gentext key="seealso" text="glej tudi"/>
-<gentext key="set" text="Postavi"/> <!-- ? -->
-<gentext key="setindex" text="Postavi stvarno kazalo"/> <!-- ? -->
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="Korak"/>
-<gentext key="tip" text="NAMIG"/>
-<gentext key="table" text="Tabela"/>
-<gentext key="tip" text="Namig"/>
-<gentext key="warning" text="POZOR"/>
-<gentext key="warning" text="Pozor"/>
-<gentext key="appendix" text="dodatek"/>
-<gentext key="chapter" text="poglavje"/>
-<gentext key="section" text="razdelek"/>
-<gentext key="sidebar" text="sidebar"/> <!-- ? -->
-<gentext key="step" text="korak"/>
-<gentext key="seealso" text="Glej tudi"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Kazalo"/>
-<gentext key="in" text="v"/>
-<gentext key="by" text="od"/> <!-- ? -->
-<gentext key="Edited" text="Urejeno"/> <!-- ? -->
-<gentext key="Editedby" text="Urejeno od"/> <!-- ? -->
-<gentext key="and" text="in"/>
-<gentext key="Notes" text="Notes"/> <!-- ? -->
-<gentext key="TableNotes" text="Notes"/> <!-- ? -->
-<gentext key="nonexistantelement" text="neobstoje&#x010D;i element"/>
-<gentext key="Pgs" text="Str."/>
-<gentext key="unsupported" text="nepodprto"/>
-<gentext key="xrefto" text="xref na"/> <!-- ? -->
-<gentext key="unexpectedelementname" text="Nepri&#x010D;akovano ime elementa"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Povzetek"/>
+ <gentext key="abstract" text="Povzetek"/>
+ <gentext key="Answer" text="O:"/>
+ <gentext key="answer" text="O:"/>
+ <gentext key="Appendix" text="Dodatek"/>
+ <gentext key="Article" text="&#268;lanek"/>
+ <gentext key="article" text="&#268;lanek"/>
+ <gentext key="Bibliography" text="Literatura"/>
+ <gentext key="bibliography" text="Literatura"/>
+ <gentext key="Book" text="Knjiga"/>
+ <gentext key="book" text="Knjiga"/>
+ <gentext key="CAUTION" text="OPOZORILO"/>
+ <gentext key="caution" text="OPOZORILO"/>
+ <gentext key="Caution" text="Opozorilo"/>
+ <gentext key="caution" text="Opozorilo"/>
+ <gentext key="Chapter" text="Poglavje"/>
+ <gentext key="Colophon" text="Kolofon"/>
+ <gentext key="colophon" text="Kolofon"/>
+ <gentext key="Copyright" text="Pravna za&#353;&#269;ita"/>
+ <gentext key="copyright" text="Pravna za&#353;&#269;ita"/>
+ <gentext key="Dedication" text="Posvetilo"/>
+ <gentext key="dedication" text="Posvetilo"/>
+ <gentext key="Edition" text="Izdaja"/>
+ <gentext key="edition" text="Izdaja"/>
+ <gentext key="Equation" text="Ena&#269;ba"/>
+ <gentext key="equation" text="Ena&#269;ba"/>
+ <gentext key="Example" text="Primer"/>
+ <gentext key="example" text="Primer"/>
+ <gentext key="Figure" text="Slika"/>
+ <gentext key="figure" text="Slika"/>
+ <gentext key="GlossSee" text="glej"/>
+ <gentext key="glosssee" text="glej"/>
+ <gentext key="GlossSeeAlso" text="glej tudi"/>
+ <gentext key="glossseealso" text="glej tudi"/>
+ <gentext key="Glossary" text="Slovar&#269;ek"/>
+ <gentext key="glossary" text="Slovar&#269;ek"/>
+ <gentext key="IMPORTANT" text="POMEMBNO"/>
+ <gentext key="important" text="POMEMBNO"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Pomembno"/>
+ <gentext key="important" text="Pomembno"/>
+ <gentext key="Index" text="Stvarno kazalo"/>
+ <gentext key="index" text="Stvarno kazalo"/>
+ <gentext key="LegalNotice" text="Pravno sporo&#269;ilo"/>
+ <gentext key="legalnotice" text="Pravno sporo&#269;ilo"/>
+ <gentext key="MsgAud" text="Ob&#269;instvo"/>
+ <gentext key="msgaud" text="Ob&#269;instvo"/>
+ <gentext key="MsgLevel" text="Raven"/>
+ <gentext key="msglevel" text="Raven"/>
+ <gentext key="MsgOrig" text="Izvor"/>
+ <gentext key="msgorig" text="Izvor"/>
+ <gentext key="NOTE" text="OPOMBA"/>
+ <gentext key="note" text="OPOMBA"/>
+ <gentext key="Note" text="Opomba"/>
+ <gentext key="note" text="Opomba"/>
+ <gentext key="Part" text="Del"/>
+ <gentext key="part" text="Del"/>
+ <gentext key="Preface" text="Predgovor"/>
+ <gentext key="preface" text="Predgovor"/>
+ <gentext key="Procedure" text="Postopek"/>
+ <gentext key="procedure" text="Postopek"/>
+ <gentext key="Published" text="Izdano"/>
+ <gentext key="published" text="Izdano"/>
+ <gentext key="Question" text="V:"/>
+ <gentext key="question" text="V:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Sklic"/>
+ <gentext key="reference" text="Sklic"/>
+ <gentext key="RefName" text="Ime"/>
+ <gentext key="refname" text="Ime"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Sinopsis"/>
+ <gentext key="refsynopsisdiv" text="Sinopsis"/>
+ <gentext key="Revision" text="Razli&#269;ica"/>
+ <gentext key="revision" text="Razli&#269;ica"/>
+ <gentext key="RevHistory" text="Zgodovina razli&#269;ic"/>
+ <gentext key="revhistory" text="Zgodovina razli&#269;ic"/>
+ <gentext key="Section" text="Razdelek"/>
+ <gentext key="See" text="glej"/>
+ <gentext key="see" text="glej"/>
+ <gentext key="SeeAlso" text="glej tudi"/>
+ <gentext key="seealso" text="glej tudi"/>
+ <gentext key="Set" text="Postavi"/>
+ <gentext key="set" text="Postavi"/>
+ <gentext key="SetIndex" text="Postavi stvarno kazalo"/>
+ <gentext key="setindex" text="Postavi stvarno kazalo"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Korak"/>
+ <gentext key="TIP" text="NAMIG"/>
+ <gentext key="tip" text="NAMIG"/>
+ <gentext key="Table" text="Tabela"/>
+ <gentext key="table" text="Tabela"/>
+ <gentext key="Tip" text="Namig"/>
+ <gentext key="tip" text="Namig"/>
+ <gentext key="WARNING" text="POZOR"/>
+ <gentext key="warning" text="POZOR"/>
+ <gentext key="Warning" text="Pozor"/>
+ <gentext key="warning" text="Pozor"/>
+ <gentext key="appendix" text="dodatek"/>
+ <gentext key="chapter" text="poglavje"/>
+ <gentext key="section" text="razdelek"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="step" text="korak"/>
+ <gentext key="Seealso" text="Glej tudi"/>
+ <gentext key="seealso" text="Glej tudi"/>
+ <gentext key="TableofContents" text="Kazalo"/>
+ <gentext key="tableofcontents" text="Kazalo"/>
+ <gentext key="in" text="v"/>
+ <gentext key="by" text="od"/>
+ <gentext key="Edited" text="Urejeno"/>
+ <gentext key="edited" text="Urejeno"/>
+ <gentext key="Editedby" text="Urejeno od"/>
+ <gentext key="editedby" text="Urejeno od"/>
+ <gentext key="and" text="in"/>
+ <gentext key="Notes" text="Notes"/>
+ <gentext key="notes" text="Notes"/>
+ <gentext key="TableNotes" text="Notes"/>
+ <gentext key="tablenotes" text="Notes"/>
+ <gentext key="nonexistantelement" text="neobstoje&#269;i element"/>
+ <gentext key="Pgs" text="Str."/>
+ <gentext key="pgs" text="Str."/>
+ <gentext key="unsupported" text="nepodprto"/>
+ <gentext key="xrefto" text="xref na"/>
+ <gentext key="unexpectedelementname" text="Nepri&#269;akovano ime elementa"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Seznam tabel"/>
+ <gentext key="listoftables" text="Seznam tabel"/>
+ <gentext key="ListofExamples" text="Seznam primerov"/>
+ <gentext key="listofexamples" text="Seznam primerov"/>
+ <gentext key="ListofFigures" text="Seznam slik"/>
+ <gentext key="listoffigures" text="Seznam slik"/>
+ <gentext key="ListofEquations" text="Seznam ena&#269;b"/>
+ <gentext key="listofequations" text="Seznam ena&#269;b"/>
+ <gentext key="ListofUnknown" text="Seznam neznanih stvari"/>
+ <gentext key="listofunknown" text="Seznam neznanih stvari"/>
+ <gentext key="nav-prev" text="Nazaj"/>
+ <gentext key="nav-prev-sibling" text="Hitro nazaj"/>
+ <gentext key="nav-next-sibling" text="Hitro naprej"/>
+ <gentext key="nav-next" text="Naprej"/>
+ <gentext key="nav-up" text="Gor"/>
+ <gentext key="nav-home" text="Domov"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Seznam tabel"/>
-<gentext key="ListofExamples" text="Seznam primerov"/>
-<gentext key="ListofFigures" text="Seznam slik"/>
-<gentext key="ListofEquations" text="Seznam ena&#x010D;b"/>
-<gentext key="ListofUnknown" text="Seznam neznanih stvari"/> <!-- ? -->
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Dodatek %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Poglavje %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Ena&#269;ba %n. %t"/>
+ <template name="example" text="Primer %n. %t"/>
+ <template name="figure" text="Slika %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="Nazaj"/>
-<gentext key="nav-prev-sibling" text="Hitro nazaj"/>
-<gentext key="nav-next-sibling" text="Hitro naprej"/>
-<gentext key="nav-next" text="Naprej"/>
-<gentext key="nav-up" text="Gor"/>
-<gentext key="nav-home" text="Domov"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text='&#8220;'/>
-<dingbat key="endquote" text='&#8221;'/>
-<dingbat key="nestedstartquote" text="`"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Dodatek %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Poglavje %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Primer %n. %t"/>
+ <template name="figure" text="Slika %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Razdelek %n"/>
+ <template name="sect2" text="Razdelek %n"/>
+ <template name="sect3" text="Razdelek %n"/>
+ <template name="sect4" text="Razdelek %n"/>
+ <template name="sect5" text="Razdelek %n"/>
+ <template name="section" text="Razdelek %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" in "/>
+ <template name="seplast" text=", in "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="glej "/>
+ <template name="seealso" text="glej tudi "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Raven: "/>
+ <template name="MsgOrig" text="Izvor: "/>
+ <template name="MsgAud" text="Ob&#269;instvo: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/sr.xml b/tests/docbook/common/sr.xml
new file mode 100644
index 00000000..7cc6e91f
--- /dev/null
+++ b/tests/docbook/common/sr.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<localization language="sr">
+
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
+
+ <gentext key="Abstract" text="Pregled"/>
+ <gentext key="abstract" text="Pregled"/>
+ <gentext key="Answer" text="O:"/>
+ <gentext key="answer" text="O:"/>
+ <gentext key="Appendix" text="Dodatak"/>
+ <gentext key="Article" text="\&#268;lanak"/>
+ <gentext key="article" text="\&#268;lanak"/>
+ <gentext key="Bibliography" text="Literatura"/>
+ <gentext key="bibliography" text="Literatura"/>
+ <gentext key="Book" text="Knjiga"/>
+ <gentext key="book" text="Knjiga"/>
+ <gentext key="CAUTION" text="UPOZORENJE"/>
+ <gentext key="caution" text="UPOZORENJE"/>
+ <gentext key="Caution" text="Upozorenje"/>
+ <gentext key="caution" text="Upozorenje"/>
+ <gentext key="Chapter" text="Poglavlje"/>
+ <gentext key="Colophon" text="Kolofon"/>
+ <gentext key="colophon" text="Kolofon"/>
+ <gentext key="Copyright" text="Pravna za\&#353;tita"/>
+ <gentext key="copyright" text="Pravna za\&#353;tita"/>
+ <gentext key="Dedication" text="Posveta"/>
+ <gentext key="dedication" text="Posveta"/>
+ <gentext key="Edition" text="Izdanje"/>
+ <gentext key="edition" text="Izdanje"/>
+ <gentext key="Equation" text="Jedna\&#269;ina"/>
+ <gentext key="equation" text="Jedna\&#269;ina"/>
+ <gentext key="Example" text="Primer"/>
+ <gentext key="example" text="Primer"/>
+ <gentext key="Figure" text="Slika"/>
+ <gentext key="figure" text="Slika"/>
+ <gentext key="GlossSee" text="Vidi"/>
+ <gentext key="glosssee" text="Vidi"/>
+ <gentext key="GlossSeeAlso" text="Vidi tako\&#273;e"/>
+ <gentext key="glossseealso" text="Vidi tako\&#273;e"/>
+ <gentext key="Glossary" text="Re\&#269;nik"/>
+ <gentext key="glossary" text="Re\&#269;nik"/>
+ <gentext key="IMPORTANT" text="VA\&#381;NO"/>
+ <gentext key="important" text="VA\&#381;NO"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Va\&#382;no"/>
+ <gentext key="important" text="Va\&#382;no"/>
+ <gentext key="Index" text="Indeks"/>
+ <gentext key="index" text="Indeks"/>
+ <gentext key="LegalNotice" text="Pravno obave\&#353;tenje"/>
+ <gentext key="legalnotice" text="Pravno obave\&#353;tenje"/>
+ <gentext key="MsgAud" text="MsgAud"/>
+ <gentext key="msgaud" text="MsgAud"/>
+ <gentext key="MsgLevel" text="Nivo"/>
+ <gentext key="msglevel" text="Nivo"/>
+ <gentext key="MsgOrig" text="Izvor"/>
+ <gentext key="msgorig" text="Izvor"/>
+ <gentext key="NOTE" text="PRIMEDBA"/>
+ <gentext key="note" text="Primedba"/>
+ <gentext key="Note" text="Primedba"/>
+ <gentext key="note" text="Primedba"/>
+ <gentext key="Part" text="Deo"/>
+ <gentext key="part" text="Deo"/>
+ <gentext key="Preface" text="Predgovor"/>
+ <gentext key="preface" text="Predgovor"/>
+ <gentext key="Procedure" text="Postupak"/>
+ <gentext key="procedure" text="Postupak"/>
+ <gentext key="Published" text="Izdato"/>
+ <gentext key="published" text="Izdato"/>
+ <gentext key="Question" text="P:"/>
+ <gentext key="question" text="P:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="Referenca"/>
+ <gentext key="reference" text="Referenca"/>
+ <gentext key="RefName" text="Ime"/>
+ <gentext key="refname" text="Ime"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Sinopsis"/>
+ <gentext key="refsynopsisdiv" text="Sinopsis"/>
+ <gentext key="Revision" text="Revizija"/>
+ <gentext key="revision" text="Revizija"/>
+ <gentext key="RevHistory" text="Istorija revizija"/>
+ <gentext key="revhistory" text="Istorija revizija"/>
+ <gentext key="Section" text="Odeljak"/>
+ <gentext key="See" text="vidi"/>
+ <gentext key="see" text="vidi"/>
+ <gentext key="SeeAlso" text="vidi tako\&#273;e"/>
+ <gentext key="seealso" text="vidi tako\&#273;e"/>
+ <gentext key="Set" text="Postavi"/>
+ <gentext key="set" text="Postavi"/>
+ <gentext key="SetIndex" text="Postavi indeks"/>
+ <gentext key="setindex" text="Postavi indeks"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="Korak"/>
+ <gentext key="TIP" text="SAVET"/>
+ <gentext key="tip" text="SAVET"/>
+ <gentext key="Table" text="Tabela"/>
+ <gentext key="table" text="Tabela"/>
+ <gentext key="Tip" text="Savet"/>
+ <gentext key="tip" text="Savet"/>
+ <gentext key="WARNING" text="UPOZORENJE"/>
+ <gentext key="warning" text="UPOZORENJE"/>
+ <gentext key="Warning" text="Upozorenje"/>
+ <gentext key="warning" text="Upozorenje"/>
+ <gentext key="appendix" text="dodatak"/>
+ <gentext key="chapter" text="poglavlje"/>
+ <gentext key="section" text="sekcija"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="step" text="korak"/>
+ <gentext key="Seealso" text="Vidi tako\&#273;e"/>
+ <gentext key="seealso" text="Vidi tako\&#273;e"/>
+ <gentext key="TableofContents" text="Sadr\&#382;aj"/>
+ <gentext key="tableofcontents" text="Sadr\&#382;aj"/>
+ <gentext key="in" text="u"/>
+ <gentext key="by" text="od"/>
+ <gentext key="Edited" text="Ure\&#273;eno"/>
+ <gentext key="edited" text="Ure\&#273;eno"/>
+ <gentext key="Editedby" text="Ure\&#273;eno od"/>
+ <gentext key="editedby" text="Ure\&#273;eno od"/>
+ <gentext key="and" text="i"/>
+ <gentext key="Notes" text="Notes"/>
+ <gentext key="notes" text="Notes"/>
+ <gentext key="TableNotes" text="Notes"/>
+ <gentext key="tablenotes" text="Notes"/>
+ <gentext key="nonexistantelement" text="nepostoje\&#263;i element"/>
+ <gentext key="Pgs" text="Str."/>
+ <gentext key="pgs" text="Str."/>
+ <gentext key="unsupported" text="nepodr\&#382;ano"/>
+ <gentext key="xrefto" text="xref na"/>
+ <gentext key="unexpectedelementname" text="Neo\&#269;ekivano ime elementa"/>
+ <gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="revisedby" text="Revised by: "/>
+ <gentext key="ListofTables" text="Spisak tabela"/>
+ <gentext key="listoftables" text="Spisak tabela"/>
+ <gentext key="ListofExamples" text="Spisak primera"/>
+ <gentext key="listofexamples" text="Spisak primera"/>
+ <gentext key="ListofFigures" text="Spisak slika"/>
+ <gentext key="listoffigures" text="Spisak slika"/>
+ <gentext key="ListofEquations" text="Spisak jedna\&#269;ina"/>
+ <gentext key="listofequations" text="Spisak jedna\&#269;ina"/>
+ <gentext key="ListofUnknown" text="Spisak nepoznanica"/>
+ <gentext key="listofunknown" text="Spisak nepoznanica"/>
+ <gentext key="nav-prev" text="Nazad"/>
+ <gentext key="nav-prev-sibling" text="Brzo nazad"/>
+ <gentext key="nav-next-sibling" text="Brzo napred"/>
+ <gentext key="nav-next" text="Napred"/>
+ <gentext key="nav-up" text="Gore"/>
+ <gentext key="nav-home" text="Ku\&#263;i"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
+
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Dodatak %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Poglavlje %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Jedna\&#269;ina %n. %t"/>
+ <template name="example" text="Primer %n. %t"/>
+ <template name="figure" text="Slika %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Deo %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
+
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
+
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
+
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+
+ <context name="xref">
+ <template name="appendix" text="Dodatak %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Poglavlje %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Primer %n. %t"/>
+ <template name="figure" text="Slika %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Deo %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabela %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Odeljak %n"/>
+ <template name="sect2" text="Odeljak %n"/>
+ <template name="sect3" text="Odeljak %n"/>
+ <template name="sect4" text="Odeljak %n"/>
+ <template name="sect5" text="Odeljak %n"/>
+ <template name="section" text="Odeljak %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" i "/>
+ <template name="seplast" text=", i "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Vidi "/>
+ <template name="seealso" text="Vidi tako\&#273;e "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Nivo: "/>
+ <template name="MsgOrig" text="Izvor: "/>
+ <template name="MsgAud" text="MsgAud: "/>
+ </context>
+</localization>
diff --git a/tests/docbook/common/subtitles.xsl b/tests/docbook/common/subtitles.xsl
new file mode 100644
index 00000000..973e87c1
--- /dev/null
+++ b/tests/docbook/common/subtitles.xsl
@@ -0,0 +1,130 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version='1.0'>
+
+<!-- ============================================================ -->
+<!-- subtitle markup -->
+
+<doc:mode mode="subtitle.markup" xmlns="">
+<refpurpose>Provides access to element subtitles</refpurpose>
+<refdescription>
+<para>Processing an element in the
+<literal role="mode">subtitle.markup</literal> mode produces the
+subtitle of the element.
+</para>
+</refdescription>
+</doc:mode>
+
+<xsl:template match="*" mode="subtitle.markup">
+ <xsl:message>
+ <xsl:text>Request for subtitle of unexpected element: </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:message>
+ <xsl:text>???SUBTITLE???</xsl:text>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="set" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(setinfo/subtitle|subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="book" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(bookinfo/subtitle|subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="part" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(partinfo/subtitle
+ |docinfo/subtitle
+ |subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="preface|chapter|appendix" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(docinfo/subtitle
+ |prefaceinfo/subtitle
+ |chapterinfo/subtitle
+ |appendixinfo/subtitle
+ |subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="article" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(artheader/subtitle
+ |articleinfo/subtitle
+ |subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="dedication|colophon" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="subtitle"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="reference" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(referenceinfo/subtitle
+ |docinfo/subtitle
+ |subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="refentry" mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(refentryinfo/subtitle
+ |docinfo/subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="section
+ |sect1|sect2|sect3|sect4|sect5
+ |refsect1|refsect2|refsect3
+ |simplesect"
+ mode="subtitle.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(sectioninfo/subtitle
+ |sect1info/subtitle
+ |sect2info/subtitle
+ |sect3info/subtitle
+ |sect4info/subtitle
+ |sect5info/subtitle
+ |refsect1info/subtitle
+ |refsect2info/subtitle
+ |refsect3info/subtitle
+ |subtitle)[1]"
+ mode="subtitle.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/tests/docbook/common/sv.xml b/tests/docbook/common/sv.xml
index 27b45cce..a20c6b4e 100644
--- a/tests/docbook/common/sv.xml
+++ b/tests/docbook/common/sv.xml
@@ -1,99 +1,339 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="sv">
-<gentext key="abstract" text="Abstrakt"/>
-<gentext key="appendix" text="Appendix"/>
-<gentext key="article" text="Artikel"/>
-<gentext key="bibliography" text="Bibliografi"/>
-<gentext key="book" text="Bok"/>
-<gentext key="caution" text="OBSERVERA"/>
-<gentext key="caution" text="Observera"/>
-<gentext key="chapter" text="Kapitel"/>
-<gentext key="copyright" text="Copyright"/>
-<gentext key="dedication" text="Dedikation"/>
-<gentext key="edition" text="Edition"/>
-<gentext key="equation" text="Ekvation"/>
-<gentext key="example" text="Exempel"/>
-<gentext key="figure" text="Figur"/>
-<gentext key="glosssee" text="Se"/>
-<gentext key="glossseealso" text="Se &#196;ven"/>
-<gentext key="glossary" text="Gloslista"/>
-<gentext key="important" text="VIKTIGT"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="important" text="Viktigt"/>
-<gentext key="index" text="Index"/>
-<gentext key="legalnotice" text="Legal Notice"/>
-<gentext key="msgaud" text="M&#229;lgrupp"/>
-<gentext key="msglevel" text="Niv&#229;"/>
-<gentext key="msgorig" text="Ursprung"/>
-<gentext key="note" text="NOT"/>
-<gentext key="note" text="Not"/>
-<gentext key="part" text="Del"/>
-<gentext key="preface" text="F&#246;retal"/>
-<gentext key="procedure" text="Procedur"/>
-<gentext key="published" text="Publicerad"/>
-<gentext key="refname" text="Namn"/>
-<gentext key="reference" text="Referens"/>
-<gentext key="revision" text="Revision"/>
-<gentext key="revhistory" text="Revisions Historik;"/>
-<gentext key="section" text="Sektion"/>
-<gentext key="see" text="Se"/>
-<gentext key="seealso" text="Se &#196;ven"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text="Sidebar"/>
-<gentext key="step" text="Steg"/>
-<gentext key="tip" text="TIPS"/>
-<gentext key="table" text="Tabell"/>
-<gentext key="tip" text="Tips"/>
-<gentext key="warning" text="VARNING"/>
-<gentext key="warning" text="Varning"/>
-<gentext key="appendix" text="appendix"/>
-<gentext key="chapter" text="kapitel"/>
-<gentext key="section" text="sektion"/>
-<gentext key="step" text="steg"/>
-<gentext key="seealso" text="Se &#228;ven"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="Inneh&#229;llsf&#246;rteckning"/>
-<gentext key="called" text="kallas"/>
-<gentext key="in" text="i"/>
-<gentext key="by" text="av"/>
-<gentext key="Edited" text="Utgiven"/>
-<gentext key="Editedby" text="Utgiven av"/>
-<gentext key="and" text="och"/>
-<gentext key="Notes" text="Noter"/>
-<gentext key="TableNotes" text="Noter"/>
-<gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="the" text=""/>
-<gentext key="Pgs" text="Sid."/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref till"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Revised by: "/>
+ <gentext key="Abstract" text="Sammanfattning"/>
+ <gentext key="abstract" text="Sammanfattning"/>
+ <gentext key="Answer" text="A:"/>
+ <gentext key="answer" text="A:"/>
+ <gentext key="Appendix" text="Appendix"/>
+ <gentext key="Article" text="Artikel"/>
+ <gentext key="article" text="Artikel"/>
+ <gentext key="Bibliography" text="Bibliografi"/>
+ <gentext key="bibliography" text="Bibliografi"/>
+ <gentext key="Book" text="Bok"/>
+ <gentext key="book" text="Bok"/>
+ <gentext key="CAUTION" text="OBSERVERA"/>
+ <gentext key="caution" text="OBSERVERA"/>
+ <gentext key="Caution" text="Observera"/>
+ <gentext key="caution" text="Observera"/>
+ <gentext key="Chapter" text="Kapitel"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="Copyright"/>
+ <gentext key="copyright" text="Copyright"/>
+ <gentext key="Dedication" text="Dedikation"/>
+ <gentext key="dedication" text="Dedikation"/>
+ <gentext key="Edition" text="Utg&#229;va"/>
+ <gentext key="edition" text="Utg&#229;va"/>
+ <gentext key="Equation" text="Ekvation"/>
+ <gentext key="equation" text="Ekvation"/>
+ <gentext key="Example" text="Exempel"/>
+ <gentext key="example" text="Exempel"/>
+ <gentext key="Figure" text="Figur"/>
+ <gentext key="figure" text="Figur"/>
+ <gentext key="GlossSee" text="Se"/>
+ <gentext key="glosssee" text="Se"/>
+ <gentext key="GlossSeeAlso" text="Se &#196;ven"/>
+ <gentext key="glossseealso" text="Se &#196;ven"/>
+ <gentext key="Glossary" text="Gloslista"/>
+ <gentext key="glossary" text="Gloslista"/>
+ <gentext key="IMPORTANT" text="VIKTIGT"/>
+ <gentext key="important" text="VIKTIGT"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="Viktigt"/>
+ <gentext key="important" text="Viktigt"/>
+ <gentext key="Index" text="Index"/>
+ <gentext key="index" text="Index"/>
+ <gentext key="LegalNotice" text="Legal Notice"/>
+ <gentext key="legalnotice" text="Legal Notice"/>
+ <gentext key="MsgAud" text="M&#229;lgrupp"/>
+ <gentext key="msgaud" text="M&#229;lgrupp"/>
+ <gentext key="MsgLevel" text="Niv&#229;"/>
+ <gentext key="msglevel" text="Niv&#229;"/>
+ <gentext key="MsgOrig" text="Ursprung"/>
+ <gentext key="msgorig" text="Ursprung"/>
+ <gentext key="NOTE" text="NOT"/>
+ <gentext key="note" text="NOT"/>
+ <gentext key="Note" text="Not"/>
+ <gentext key="note" text="Not"/>
+ <gentext key="Part" text="Del"/>
+ <gentext key="part" text="Del"/>
+ <gentext key="Preface" text="F&#246;retal"/>
+ <gentext key="preface" text="F&#246;retal"/>
+ <gentext key="Procedure" text="Procedur"/>
+ <gentext key="procedure" text="Procedur"/>
+ <gentext key="Published" text="Publicerad"/>
+ <gentext key="published" text="Publicerad"/>
+ <gentext key="Question" text="Fr&#229;ga:"/>
+ <gentext key="question" text="Fr&#229;ga:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="RefName" text="Namn"/>
+ <gentext key="refname" text="Namn"/>
+ <gentext key="Reference" text="Referens"/>
+ <gentext key="reference" text="Referens"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="Synopsis"/>
+ <gentext key="refsynopsisdiv" text="Synopsis"/>
+ <gentext key="Revision" text="Revision"/>
+ <gentext key="revision" text="Revision"/>
+ <gentext key="RevHistory" text="Revisions Historik;"/>
+ <gentext key="revhistory" text="Revisions Historik;"/>
+ <gentext key="Section" text="Avsnitt"/>
+ <gentext key="See" text="Se"/>
+ <gentext key="see" text="Se"/>
+ <gentext key="SeeAlso" text="Se &#196;ven"/>
+ <gentext key="seealso" text="Se &#196;ven"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text="Sidebar"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="Step" text="Steg"/>
+ <gentext key="TIP" text="TIPS"/>
+ <gentext key="tip" text="TIPS"/>
+ <gentext key="Table" text="Tabell"/>
+ <gentext key="table" text="Tabell"/>
+ <gentext key="Tip" text="Tips"/>
+ <gentext key="tip" text="Tips"/>
+ <gentext key="WARNING" text="VARNING"/>
+ <gentext key="warning" text="VARNING"/>
+ <gentext key="Warning" text="Varning"/>
+ <gentext key="warning" text="Varning"/>
+ <gentext key="appendix" text="appendix"/>
+ <gentext key="chapter" text="kapitel"/>
+ <gentext key="section" text="avsnitt"/>
+ <gentext key="step" text="steg"/>
+ <gentext key="Seealso" text="Se &#228;ven"/>
+ <gentext key="seealso" text="Se &#228;ven"/>
+ <gentext key="TableofContents" text="Inneh&#229;llsf&#246;rteckning"/>
+ <gentext key="tableofcontents" text="Inneh&#229;llsf&#246;rteckning"/>
+ <gentext key="called" text="kallas"/>
+ <gentext key="in" text="i"/>
+ <gentext key="by" text="av"/>
+ <gentext key="Edited" text="Redigerad"/>
+ <gentext key="edited" text="Redigerad"/>
+ <gentext key="Editedby" text="Redigerad av"/>
+ <gentext key="editedby" text="Redigerad av"/>
+ <gentext key="and" text="och"/>
+ <gentext key="Notes" text="Noter"/>
+ <gentext key="notes" text="Noter"/>
+ <gentext key="TableNotes" text="Noter"/>
+ <gentext key="tablenotes" text="Noter"/>
+ <gentext key="nonexistantelement" text="non-existant element"/>
+ <gentext key="the" text=""/>
+ <gentext key="Pgs" text="Sid."/>
+ <gentext key="pgs" text="Sid."/>
+ <gentext key="unsupported" text="unsupported"/>
+ <gentext key="xrefto" text="xref till"/>
+ <gentext key="unexpectedelementname" text="Unexpected element name"/>
+ <gentext key="Revisedby" text="Reviderad av: "/>
+ <gentext key="revisedby" text="Reviderad av: "/>
+ <gentext key="ListofTables" text="Tabellf&#246;rteckning"/>
+ <gentext key="listoftables" text="Tabellf&#246;rteckning"/>
+ <gentext key="ListofExamples" text="Exempelf&#246;rteckning"/>
+ <gentext key="listofexamples" text="Exempelf&#246;rteckning"/>
+ <gentext key="ListofFigures" text="Figurf&#246;rteckning"/>
+ <gentext key="listoffigures" text="Figurf&#246;rteckning"/>
+ <gentext key="ListofEquations" text="Ekvationsf&#246;rteckning"/>
+ <gentext key="listofequations" text="Ekvationsf&#246;rteckning"/>
+ <gentext key="ListofUnknown" text="F&#246;rteckning av ok&#228;nda"/>
+ <gentext key="listofunknown" text="F&#246;rteckning av ok&#228;nda"/>
+ <gentext key="nav-prev" text="F&#246;reg&#229;ende"/>
+ <gentext key="nav-prev-sibling" text="Snabbt fram&#229;t"/>
+ <gentext key="nav-next-sibling" text="Snabbt bak&#229;t"/>
+ <gentext key="nav-next" text="N&#228;sta"/>
+ <gentext key="nav-up" text="Upp"/>
+ <gentext key="nav-home" text="Hem"/>
+ <dingbat key="startquote" text="&#8220;"/>
+ <dingbat key="endquote" text="&#8221;"/>
+ <dingbat key="nestedstartquote" text="&#8216;"/>
+ <dingbat key="nestedendquote" text="&#8217;"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="Tabellf&#246;rteckning"/>
-<gentext key="ListofExamples" text="Exempelf&#246;rteckning"/>
-<gentext key="ListofFigures" text="Figurf&#246;rteckning"/>
-<gentext key="ListofEquations" text="Ekvationsf&#246;rteckning"/>
-<gentext key="ListofUnknown" text="F&#246;rteckning av ok&#228;nda"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="Appendix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="Ekvation %n. %t"/>
+ <template name="example" text="Exempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="Tabell %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="F&#246;rutg&#229;ende"/>
-<gentext key="nav-prev-sibling" text="Snabbt framm&#229;t"/>
-<gentext key="nav-next-sibling" text="Snabbt bak&#229;t"/>
-<gentext key="nav-next" text="N&#228;sta"/>
-<gentext key="nav-up" text="Upp"/>
-<gentext key="nav-home" text="Hem"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="bibliography" text="%t"/>
-<xref element="chapter" text="%g %n, %t"/>
-<xref element="dedication" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
-<xref element="preface" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="Appendix %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="Kapitel %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="Exempel %n. %t"/>
+ <template name="figure" text="Figur %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="Del %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="Tabell %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="Avsnitt %n"/>
+ <template name="sect2" text="Avsnitt %n"/>
+ <template name="sect3" text="Avsnitt %n"/>
+ <template name="sect4" text="Avsnitt %n"/>
+ <template name="sect5" text="Avsnitt %n"/>
+ <template name="section" text="Avsnitt %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" och "/>
+ <template name="seplast" text=", och "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="Se "/>
+ <template name="seealso" text="Se &#196;ven "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="Niv&#229;: "/>
+ <template name="MsgOrig" text="Ursprung: "/>
+ <template name="MsgAud" text="M&#229;lgrupp: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/titles.xsl b/tests/docbook/common/titles.xsl
new file mode 100644
index 00000000..2c5e8c27
--- /dev/null
+++ b/tests/docbook/common/titles.xsl
@@ -0,0 +1,335 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version='1.0'>
+
+<!-- ============================================================ -->
+<!-- title markup -->
+
+<doc:mode mode="title.markup" xmlns="">
+<refpurpose>Provides access to element titles</refpurpose>
+<refdescription>
+<para>Processing an element in the
+<literal role="mode">title.markup</literal> mode produces the
+title of the element. This does not include the label.
+</para>
+</refdescription>
+</doc:mode>
+
+<xsl:template match="*" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:choose>
+ <xsl:when test="title">
+ <xsl:apply-templates select="title[1]" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:when test="local-name(.) = 'partintro'">
+ <!-- partintro's don't have titles, use the parent (part or reference)
+ title instead. -->
+ <xsl:apply-templates select="parent::*" mode="title.markup"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>Request for title of unexpected element: </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:message>
+ <xsl:text>???TITLE???</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="title" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:choose>
+ <xsl:when test="$allow-anchors != 0">
+ <xsl:apply-templates/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates mode="no.anchor.mode"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="set" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(setinfo/title|title)[1]"
+ mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="book" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(bookinfo/title|title)[1]"
+ mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="part" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(partinfo/title|docinfo/title|title)[1]"
+ mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="preface|chapter|appendix" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+
+<!--
+ <xsl:message>
+ <xsl:value-of select="name(.)"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$allow-anchors"/>
+ </xsl:message>
+-->
+
+ <xsl:variable name="title" select="(docinfo/title
+ |prefaceinfo/title
+ |chapterinfo/title
+ |appendixinfo/title
+ |title)[1]"/>
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="dedication" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:choose>
+ <xsl:when test="title">
+ <xsl:apply-templates select="title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Dedication'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="colophon" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:choose>
+ <xsl:when test="title">
+ <xsl:apply-templates select="title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Colophon'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="article" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="(artheader/title
+ |articleinfo/title
+ |title)[1]"/>
+
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="reference" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="(referenceinfo/title|docinfo/title|title)[1]"
+ mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="refentry" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="refmeta" select=".//refmeta"/>
+ <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
+ <xsl:variable name="refnamediv" select=".//refnamediv"/>
+ <xsl:variable name="refname" select="$refnamediv//refname"/>
+
+ <xsl:variable name="title">
+ <xsl:choose>
+ <xsl:when test="$refentrytitle">
+ <xsl:apply-templates select="$refentrytitle[1]" mode="title.markup"/>
+ </xsl:when>
+ <xsl:when test="$refname">
+ <xsl:apply-templates select="$refname[1]" mode="title.markup"/>
+ </xsl:when>
+ <xsl:otherwise>REFENTRY WITHOUT TITLE???</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:copy-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="refentrytitle|refname" mode="title.markup">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="section
+ |sect1|sect2|sect3|sect4|sect5
+ |refsect1|refsect2|refsect3
+ |simplesect"
+ mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="(sectioninfo/title
+ |sect1info/title
+ |sect2info/title
+ |sect3info/title
+ |sect4info/title
+ |sect5info/title
+ |refsect1info/title
+ |refsect2info/title
+ |refsect3info/title
+ |title)[1]"/>
+
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="bibliography" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="(bibliographyinfo/title|title)[1]"/>
+ <xsl:choose>
+ <xsl:when test="$title">
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Bibliography'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="glossary" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="(glossaryinfo/title|title)[1]"/>
+ <xsl:choose>
+ <xsl:when test="$title">
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext.element.name">
+ <xsl:with-param name="element.name" select="name(.)"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="index" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="(indexinfo/title|title)[1]"/>
+ <xsl:choose>
+ <xsl:when test="$title">
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Index'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="figure|table|example|equation" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:apply-templates select="title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="abstract" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:choose>
+ <xsl:when test="title">
+ <xsl:apply-templates select="title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Abstract'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="caution|tip|warning|important|note" mode="title.markup">
+ <xsl:param name="allow-anchors" select="'0'"/>
+ <xsl:variable name="title" select="title[1]"/>
+ <xsl:choose>
+ <xsl:when test="$title">
+ <xsl:apply-templates select="$title" mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">
+ <xsl:choose>
+ <xsl:when test="local-name(.)='note'">Note</xsl:when>
+ <xsl:when test="local-name(.)='important'">Important</xsl:when>
+ <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
+ <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
+ <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="no.anchor.mode">
+ <xsl:apply-templates select="."/>
+</xsl:template>
+
+<xsl:template match="footnote" mode="no.anchor.mode">
+ <!-- nop, suppressed -->
+</xsl:template>
+
+<xsl:template match="anchor" mode="no.anchor.mode">
+ <!-- nop, suppressed -->
+</xsl:template>
+
+<xsl:template match="ulink" mode="no.anchor.mode">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="link" mode="no.anchor.mode">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="olink" mode="no.anchor.mode">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="no.anchor.mode">
+ <!-- nop, suppressed -->
+</xsl:template>
+
+<xsl:template match="xref" mode="no.anchor.mode">
+ <!-- FIXME: this should generate the text without the link... -->
+</xsl:template>
+
+<!-- ============================================================ -->
+
+</xsl:stylesheet>
+
diff --git a/tests/docbook/common/zh_cn.xml b/tests/docbook/common/zh_cn.xml
index ef373b4a..7e310ee0 100644
--- a/tests/docbook/common/zh_cn.xml
+++ b/tests/docbook/common/zh_cn.xml
@@ -1,95 +1,337 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="zh_cn">
-<gentext key="abstract" text="&#x6458;&#x8981;"/>
-<gentext key="answer" text="&#x7B54;:"/>
-<gentext key="appendix" text="&#x9644;&#x5F55;"/>
-<gentext key="article" text="&#x6587;&#x7AE0;"/>
-<gentext key="bibliography" text="&#x53C2;&#x8003;&#x4E66;&#x76EE;"/>
-<gentext key="book" text="&#x4E66;&#x76EE;"/>
-<gentext key="caution" text="&#x6CE8;&#x610F;"/>
-<gentext key="chapter" text="&#x7AE0;"/>
-<gentext key="colophon" text="Colophon"/>
-<gentext key="copyright" text="&#x7248;&#x6743;"/>
-<gentext key="dedication" text="&#x5949;&#x732E;"/>
-<gentext key="edition" text="&#x7248;"/>
-<gentext key="equation" text="&#x65B9;&#x7A0B;"/>
-<gentext key="example" text="&#x4F8B;&#x5B50;"/>
-<gentext key="figure" text="&#x56FE;&#x5F62;"/>
-<gentext key="glossary" text="&#x672F;&#x8BED;&#x8868;"/>
-<gentext key="glosssee" text="&#x89C1;"/>
-<gentext key="glossseealso" text="&#x53E6;&#x89C1;"/>
-<gentext key="important" text="&#x91CD;&#x8981;"/>
-<gentext key="index" text="&#x7D22;&#x5F15;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="legalnotice" text="&#x6CD5;&#x5F8B;&#x5E03;&#x544A;"/>
-<gentext key="msgaud" text="&#x8BFB;&#x8005;"/>
-<gentext key="msglevel" text="&#x96BE;&#x5EA6;"/>
-<gentext key="msgorig" text="&#x51FA;&#x5904;"/>
-<gentext key="note" text="&#x6CE8;"/>
-<gentext key="part" text="&#x90E8;&#x5206;"/>
-<gentext key="preface" text="&#x524D;&#x8A00;"/>
-<gentext key="procedure" text="&#x8FC7;&#x7A0B;"/>
-<gentext key="published" text="&#x51FA;&#x7248;"/>
-<gentext key="question" text="&#x95EE;:"/>
-<gentext key="refentry" text=""/>
-<gentext key="reference" text="&#x53C2;&#x8003;"/>
-<gentext key="refname" text="&#x540D;&#x5B57;"/>
-<gentext key="refsection" text=""/>
-<gentext key="refsynopsisdiv" text="&#x5927;&#x7EB2;"/>
-<gentext key="revhistory" text="&#x4FEE;&#x8BA2;&#x5386;&#x53F2;"/>
-<gentext key="revision" text="&#x4FEE;&#x8BA2;"/>
-<gentext key="section" text="&#x8282;"/>
-<gentext key="see" text="&#x89C1;"/>
-<gentext key="seealso" text="&#x53E6;&#x89C1;"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="step" text="&#x6B65;&#x9AA4;"/>
-<gentext key="table" text="&#x8868;&#x683C;"/>
-<gentext key="tip" text="&#x63D0;&#x793A;"/>
-<gentext key="tip" text="&#x63D0;&#x793A;"/>
-<gentext key="warning" text="&#x8B66;&#x544A;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents" text="&#x76EE;&#x5F55;"/>
-<gentext key="in" text="&#x5728;"/>
-<gentext key="by" text="&#x7531;"/>
-<gentext key="Edited" text="&#x7F16;&#x8F91;"/>
-<gentext key="Editedby" text="&#x7F16;&#x8F91;"/>
-<gentext key="and" text="&#x548C;"/>
-<gentext key="Notes" text="&#x6CE8;"/>
-<gentext key="TableNotes" text="&#x6CE8;"/>
-<gentext key="nonexistantelement" text="&#x4E0D;&#x5B58;&#x5728;&#x7684;&#x5143;&#x7D20;"/>
-<gentext key="Pgs" text="&#x9875;"/>
-<gentext key="unsupported" text="&#x4E0D;&#x652F;&#x6301;"/>
-<gentext key="xrefto" text="&#x53C2;&#x7167;"/>
-<gentext key="unexpectedelementname" text="&#x672A;&#x9884;&#x6599;&#x5230;&#x7684;&#x5143;&#x7D20;&#x540D;"/>
-<gentext key="Revisedby" text="&#x4FEE;&#x8BA2;"/>
+ <gentext key="Abstract" text="&#25688;&#35201;"/>
+ <gentext key="abstract" text="&#25688;&#35201;"/>
+ <gentext key="Answer" text="&#31572;:"/>
+ <gentext key="answer" text="&#31572;:"/>
+ <gentext key="Appendix" text="&#38468;&#24405;"/>
+ <gentext key="Article" text="&#25991;&#31456;"/>
+ <gentext key="article" text="&#25991;&#31456;"/>
+ <gentext key="Bibliography" text="&#21442;&#32771;&#20070;&#30446;"/>
+ <gentext key="bibliography" text="&#21442;&#32771;&#20070;&#30446;"/>
+ <gentext key="Book" text="&#20070;&#30446;"/>
+ <gentext key="book" text="&#20070;&#30446;"/>
+ <gentext key="CAUTION" text="&#27880;&#24847;"/>
+ <gentext key="caution" text="&#27880;&#24847;"/>
+ <gentext key="Caution" text="&#27880;&#24847;"/>
+ <gentext key="caution" text="&#27880;&#24847;"/>
+ <gentext key="Chapter" text="&#31456;"/>
+ <gentext key="Colophon" text="Colophon"/>
+ <gentext key="colophon" text="Colophon"/>
+ <gentext key="Copyright" text="&#29256;&#26435;"/>
+ <gentext key="copyright" text="&#29256;&#26435;"/>
+ <gentext key="Dedication" text="&#22857;&#29486;"/>
+ <gentext key="dedication" text="&#22857;&#29486;"/>
+ <gentext key="Edition" text="&#29256;"/>
+ <gentext key="edition" text="&#29256;"/>
+ <gentext key="Equation" text="&#26041;&#31243;"/>
+ <gentext key="equation" text="&#26041;&#31243;"/>
+ <gentext key="Example" text="&#20363;&#23376;"/>
+ <gentext key="example" text="&#20363;&#23376;"/>
+ <gentext key="Figure" text="&#22270;&#24418;"/>
+ <gentext key="figure" text="&#22270;&#24418;"/>
+ <gentext key="GlossSee" text="&#35265;"/>
+ <gentext key="glosssee" text="&#35265;"/>
+ <gentext key="GlossSeeAlso" text="&#21478;&#35265;"/>
+ <gentext key="glossseealso" text="&#21478;&#35265;"/>
+ <gentext key="Glossary" text="&#26415;&#35821;&#34920;"/>
+ <gentext key="glossary" text="&#26415;&#35821;&#34920;"/>
+ <gentext key="IMPORTANT" text="&#37325;&#35201;"/>
+ <gentext key="important" text="&#37325;&#35201;"/>
+ <gentext key="ISBN" text="ISBN"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="Important" text="&#37325;&#35201;"/>
+ <gentext key="important" text="&#37325;&#35201;"/>
+ <gentext key="Index" text="&#32034;&#24341;"/>
+ <gentext key="index" text="&#32034;&#24341;"/>
+ <gentext key="LegalNotice" text="&#27861;&#24459;&#24067;&#21578;"/>
+ <gentext key="legalnotice" text="&#27861;&#24459;&#24067;&#21578;"/>
+ <gentext key="MsgAud" text="&#35835;&#32773;"/>
+ <gentext key="msgaud" text="&#35835;&#32773;"/>
+ <gentext key="MsgLevel" text="&#38590;&#24230;"/>
+ <gentext key="msglevel" text="&#38590;&#24230;"/>
+ <gentext key="MsgOrig" text="&#20986;&#22788;"/>
+ <gentext key="msgorig" text="&#20986;&#22788;"/>
+ <gentext key="NOTE" text="&#27880;"/>
+ <gentext key="note" text="&#27880;"/>
+ <gentext key="Note" text="&#27880;"/>
+ <gentext key="note" text="&#27880;"/>
+ <gentext key="Part" text="&#37096;&#20998;"/>
+ <gentext key="part" text="&#37096;&#20998;"/>
+ <gentext key="Preface" text="&#21069;&#35328;"/>
+ <gentext key="preface" text="&#21069;&#35328;"/>
+ <gentext key="Procedure" text="&#36807;&#31243;"/>
+ <gentext key="procedure" text="&#36807;&#31243;"/>
+ <gentext key="Published" text="&#20986;&#29256;"/>
+ <gentext key="published" text="&#20986;&#29256;"/>
+ <gentext key="Question" text="&#38382;:"/>
+ <gentext key="question" text="&#38382;:"/>
+ <gentext key="RefEntry" text=""/>
+ <gentext key="refentry" text=""/>
+ <gentext key="Reference" text="&#21442;&#32771;"/>
+ <gentext key="reference" text="&#21442;&#32771;"/>
+ <gentext key="RefName" text="&#21517;&#23383;"/>
+ <gentext key="refname" text="&#21517;&#23383;"/>
+ <gentext key="RefSection" text=""/>
+ <gentext key="refsection" text=""/>
+ <gentext key="RefSynopsisDiv" text="&#22823;&#32434;"/>
+ <gentext key="refsynopsisdiv" text="&#22823;&#32434;"/>
+ <gentext key="Revision" text="&#20462;&#35746;"/>
+ <gentext key="revision" text="&#20462;&#35746;"/>
+ <gentext key="RevHistory" text="&#20462;&#35746;&#21382;&#21490;"/>
+ <gentext key="revhistory" text="&#20462;&#35746;&#21382;&#21490;"/>
+ <gentext key="Section" text="&#33410;"/>
+ <gentext key="See" text="&#35265;"/>
+ <gentext key="see" text="&#35265;"/>
+ <gentext key="SeeAlso" text="&#21478;&#35265;"/>
+ <gentext key="seealso" text="&#21478;&#35265;"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="Step" text="&#27493;&#39588;"/>
+ <gentext key="TIP" text="&#25552;&#31034;"/>
+ <gentext key="tip" text="&#25552;&#31034;"/>
+ <gentext key="Table" text="&#34920;&#26684;"/>
+ <gentext key="table" text="&#34920;&#26684;"/>
+ <gentext key="Tip" text="&#25552;&#31034;"/>
+ <gentext key="tip" text="&#25552;&#31034;"/>
+ <gentext key="WARNING" text="&#35686;&#21578;"/>
+ <gentext key="warning" text="&#35686;&#21578;"/>
+ <gentext key="Warning" text="&#35686;&#21578;"/>
+ <gentext key="warning" text="&#35686;&#21578;"/>
+ <gentext key="appendix" text="&#38468;&#24405;"/>
+ <gentext key="chapter" text="&#31456;"/>
+ <gentext key="section" text="&#33410;"/>
+ <gentext key="sidebar" text="sidebar"/>
+ <gentext key="step" text="&#27493;&#39588;"/>
+ <gentext key="Seealso" text="&#21478;&#35265;"/>
+ <gentext key="seealso" text="&#21478;&#35265;"/>
+ <gentext key="TableofContents" text="&#30446;&#24405;"/>
+ <gentext key="tableofcontents" text="&#30446;&#24405;"/>
+ <gentext key="in" text="&#22312;"/>
+ <gentext key="by" text="&#30001;"/>
+ <gentext key="Edited" text="&#32534;&#36753;"/>
+ <gentext key="edited" text="&#32534;&#36753;"/>
+ <gentext key="Editedby" text="&#32534;&#36753;"/>
+ <gentext key="editedby" text="&#32534;&#36753;"/>
+ <gentext key="and" text="&#21644;"/>
+ <gentext key="Notes" text="&#27880;"/>
+ <gentext key="notes" text="&#27880;"/>
+ <gentext key="TableNotes" text="&#27880;"/>
+ <gentext key="tablenotes" text="&#27880;"/>
+ <gentext key="nonexistantelement" text="&#19981;&#23384;&#22312;&#30340;&#20803;&#32032;"/>
+ <gentext key="Pgs" text="&#39029;"/>
+ <gentext key="pgs" text="&#39029;"/>
+ <gentext key="unsupported" text="&#19981;&#25903;&#25345;"/>
+ <gentext key="xrefto" text="&#21442;&#29031;"/>
+ <gentext key="unexpectedelementname" text="&#26410;&#39044;&#26009;&#21040;&#30340;&#20803;&#32032;&#21517;"/>
+ <gentext key="Revisedby" text="&#20462;&#35746;"/>
+ <gentext key="revisedby" text="&#20462;&#35746;"/>
+ <gentext key="ListofTables" text="&#34920;&#26684;&#21015;&#34920;"/>
+ <gentext key="listoftables" text="&#34920;&#26684;&#21015;&#34920;"/>
+ <gentext key="ListofExamples" text="&#31034;&#20363;&#21015;&#34920;"/>
+ <gentext key="listofexamples" text="&#31034;&#20363;&#21015;&#34920;"/>
+ <gentext key="ListofFigures" text="&#22270;&#24418;&#21015;&#34920;"/>
+ <gentext key="listoffigures" text="&#22270;&#24418;&#21015;&#34920;"/>
+ <gentext key="ListofEquations" text="&#26041;&#31243;&#24335;&#21015;&#34920;"/>
+ <gentext key="listofequations" text="&#26041;&#31243;&#24335;&#21015;&#34920;"/>
+ <gentext key="ListofUnknown" text="&#20854;&#20182;&#20869;&#23481;&#21015;&#34920;"/>
+ <gentext key="listofunknown" text="&#20854;&#20182;&#20869;&#23481;&#21015;&#34920;"/>
+ <gentext key="nav-prev" text="&#21518;&#36864;"/>
+ <gentext key="nav-prev-sibling" text="&#24555;&#36895;&#21518;&#36864;"/>
+ <gentext key="nav-next-sibling" text="&#24555;&#36895;&#21069;&#36827;"/>
+ <gentext key="nav-next" text="&#21069;&#36827;"/>
+ <gentext key="nav-up" text="&#19978;&#19968;&#32423;"/>
+ <gentext key="nav-home" text="&#36215;&#28857;"/>
+ <dingbat key="startquote" text="&#34;"/>
+ <dingbat key="endquote" text="&#34;"/>
+ <dingbat key="nestedstartquote" text="'"/>
+ <dingbat key="nestedendquote" text="'"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="&#x8868;&#x683C;&#x5217;&#x8868;"/>
-<gentext key="ListofExamples" text="&#x793A;&#x4F8B;&#x5217;&#x8868;"/>
-<gentext key="ListofFigures" text="&#x56FE;&#x5F62;&#x5217;&#x8868;"/>
-<gentext key="ListofEquations" text="&#x65B9;&#x7A0B;&#x5F0F;&#x5217;&#x8868;"/>
-<gentext key="ListofUnknown" text="&#x5176;&#x4ED6;&#x5185;&#x5BB9;&#x5217;&#x8868;"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#38468;&#24405; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="&#31456; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#26041;&#31243; %n. %t"/>
+ <template name="example" text="&#20363;&#23376; %n. %t"/>
+ <template name="figure" text="&#22270;&#24418; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#37096;&#20998; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#34920;&#26684; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="&#x540E;&#x9000;"/>
-<gentext key="nav-prev-sibling" text="&#x5FEB;&#x901F;&#x540E;&#x9000;"/>
-<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x524D;&#x8FDB;"/>
-<gentext key="nav-next" text="&#x524D;&#x8FDB;"/>
-<gentext key="nav-up" text="&#x4E0A;&#x4E00;&#x7EA7;"/>
-<gentext key="nav-home" text="&#x8D77;&#x70B9;"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text='"'/>
-<dingbat key="endquote" text='"'/>
-<dingbat key="nestedstartquote" text="'"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="appendix" text="%g %n"/>
-<xref element="chapter" text="%g %n"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="&#38468;&#24405; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="&#31456; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#20363;&#23376; %n. %t"/>
+ <template name="figure" text="&#22270;&#24418; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#37096;&#20998; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#34920;&#26684; %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="&#33410; %n"/>
+ <template name="sect2" text="&#33410; %n"/>
+ <template name="sect3" text="&#33410; %n"/>
+ <template name="sect4" text="&#33410; %n"/>
+ <template name="sect5" text="&#33410; %n"/>
+ <template name="section" text="&#33410; %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#21644; "/>
+ <template name="seplast" text=", &#21644; "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="&#35265; "/>
+ <template name="seealso" text="&#21478;&#35265; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#38590;&#24230;: "/>
+ <template name="MsgOrig" text="&#20986;&#22788;: "/>
+ <template name="MsgAud" text="&#35835;&#32773;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/common/zh_tw.xml b/tests/docbook/common/zh_tw.xml
index 7168114f..f67e70d4 100644
--- a/tests/docbook/common/zh_tw.xml
+++ b/tests/docbook/common/zh_tw.xml
@@ -1,98 +1,313 @@
+<?xml version="1.0" encoding="US-ASCII"?>
<localization language="zh_tw">
-<gentext key="abstract" text="&#x6458;&#x8981;"/>
-<gentext key="answer" text="&#x7B54;&#xFF1A;"/>
-<gentext key="appendix" text="&#x9644;&#x9304;"/>
-<gentext key="article" text="&#x6587;&#x7AE0;"/>
-<gentext key="bibliography" text="&#x53C3;&#x8003;&#x6587;&#x737B;"/>
-<gentext key="book" text="&#x66F8;&#x76EE;"/>
-<gentext key="caution" text="&#x6CE8;&#x610F;"/>
-<gentext key="chapter" text="&#x7AE0;"/>
-<gentext key="colophon" text="&#x7248;&#x672C;&#x8A18;&#x9304;"/>
-<gentext key="copyright" text="&#x7248;&#x6B0A;"/>
-<gentext key="dedication" text="&#x5949;&#x737B;"/>
-<gentext key="edition" text="&#x7248;"/>
-<gentext key="equation" text="&#x65B9;&#x7A0B;&#x5F0F;"/>
-<gentext key="example" text="&#x7BC4;&#x4F8B;"/>
-<gentext key="figure" text="&#x5716;&#x5F62;"/>
-<gentext key="glossary" text="&#x5C0F;&#x8FAD;&#x5F59;"/>
-<gentext key="glosssee" text="&#x53C3;&#x898B;"/>
-<gentext key="glossseealso" text="&#x53E6;&#x53C3;&#x898B;"/>
-<gentext key="important" text="&#x91CD;&#x8981;"/>
-<gentext key="index" text="&#x7D22;&#x5F15;"/>
-<gentext key="isbn" text="ISBN"/>
-<gentext key="legalnotice" text="&#x6CD5;&#x5F8B;&#x8072;&#x660E;"/>
-<gentext key="msgaud" text="&#x8B80;&#x8005;"/>
-<gentext key="msglevel" text="&#x7A0B;&#x5EA6;"/>
-<gentext key="msgorig" text="&#x51FA;&#x8655;"/>
-<gentext key="note" text="&#x6CE8;"/>
-<gentext key="part" text="&#x90E8;"/>
-<gentext key="preface" text="&#x5E8F;&#x8A00;"/>
-<gentext key="procedure" text="&#x904E;&#x7A0B;"/>
-<gentext key="published" text="&#x51FA;&#x7248;"/>
-<gentext key="question" text="&#x554F;&#xFF1A;"/>
-<gentext key="refentry" text="&#x53C3;&#x7167;&#x9805;&#x76EE;"/>
-<gentext key="reference" text="&#x53C3;&#x8003;"/>
-<gentext key="refname" text="&#x53C3;&#x8003;&#x540D;"/>
-<gentext key="refsection" text="&#x53C3;&#x7167;&#x7AE0;&#x7BC0;"/>
-<gentext key="refsynopsisdiv" text="&#x5927;&#x7DB1;"/>
-<gentext key="revhistory" text="&#x4FEE;&#x8A02;&#x8A18;&#x9304;"/>
-<gentext key="revision" text="&#x4FEE;&#x8A02;"/>
-<gentext key="section" text="&#x7BC0;"/>
-<gentext key="see" text="&#x898B;"/>
-<gentext key="seealso" text="&#x53E6;&#x898B;"/>
-<gentext key="set" text="Set"/>
-<gentext key="setindex" text="Set Index"/>
-<gentext key="sidebar" text=""/>
-<gentext key="step" text="&#x6B65;&#x9A5F;"/>
-<gentext key="table" text="&#x8868;&#x683C;"/>
-<gentext key="tip" text="&#x63D0;&#x793A;"/>
-<gentext key="tip" text="&#x63D0;&#x793A;"/>
-<gentext key="warning" text="&#x8B66;&#x544A;"/>
+<!-- This file is generated automatically. -->
+<!-- Do not edit this file by hand! -->
+<!-- See http://docbook.sourceforge.net/ -->
-<gentext key="TableofContents"
- text="&#x5167;&#x5BB9;&#x76EE;&#x9304;"/>
-<gentext key="in" text="&#x5728;"/>
-<gentext key="by" text="&#x7531;"/>
-<gentext key="Edited" text="&#x7DE8;&#x8F2F;"/>
-<gentext key="Editedby" text="&#x7DE8;&#x8F2F;"/>
-<gentext key="and" text="&#x4E14;"/>
-<gentext key="Notes" text="&#x6CE8;"/>
-<gentext key="TableNotes" text="&#x6CE8;&#x91CB;"/>
-<gentext key="nonexistantelement"
- text="&#x4E0D;&#x5B58;&#x5728;&#x7684;&#x5143;&#x7D20;"/>
-<gentext key="Pgs" text="&#x9801;"/>
-<gentext key="unsupported" text="&#x672A;&#x652F;&#x63F4;"/>
-<gentext key="xrefto" text="&#x53C3;&#x7167;"/>
-<gentext key="unexpectedelementname"
- text="&#x975E;&#x9810;&#x671F;&#x7684;&#x5143;&#x7D20;&#x540D;"/>
-<gentext key="Revisedby" text="&#x4FEE;&#x8A02;"/>
+ <gentext key="abstract" text="&#25688;&#35201;"/>
+ <gentext key="Abstract" text="&#25688;&#35201;"/>
+ <gentext key="Answer" text="&#31572;&#65306;"/>
+ <gentext key="answer" text="&#31572;&#65306;"/>
+ <gentext key="Appendix" text="&#38468;&#37636;"/>
+ <gentext key="appendix" text="&#38468;&#37636;"/>
+ <gentext key="article" text="&#25991;&#31456;"/>
+ <gentext key="Article" text="&#25991;&#31456;"/>
+ <gentext key="Bibliography" text="&#21443;&#32771;&#25991;&#29563;"/>
+ <gentext key="bibliography" text="&#21443;&#32771;&#25991;&#29563;"/>
+ <gentext key="book" text="&#26360;&#30446;"/>
+ <gentext key="Book" text="&#26360;&#30446;"/>
+ <gentext key="caution" text="&#27880;&#24847;"/>
+ <gentext key="Caution" text="&#27880;&#24847;"/>
+ <gentext key="Chapter" text="&#31456;"/>
+ <gentext key="chapter" text="&#31456;"/>
+ <gentext key="colophon" text="&#29256;&#26412;&#35352;&#37636;"/>
+ <gentext key="Colophon" text="&#29256;&#26412;&#35352;&#37636;"/>
+ <gentext key="copyright" text="&#29256;&#27402;"/>
+ <gentext key="Copyright" text="&#29256;&#27402;"/>
+ <gentext key="dedication" text="&#22857;&#29563;"/>
+ <gentext key="Dedication" text="&#22857;&#29563;"/>
+ <gentext key="Edition" text="&#29256;"/>
+ <gentext key="edition" text="&#29256;"/>
+ <gentext key="Equation" text="&#26041;&#31243;&#24335;"/>
+ <gentext key="equation" text="&#26041;&#31243;&#24335;"/>
+ <gentext key="Example" text="&#31684;&#20363;"/>
+ <gentext key="example" text="&#31684;&#20363;"/>
+ <gentext key="Figure" text="&#22294;&#24418;"/>
+ <gentext key="figure" text="&#22294;&#24418;"/>
+ <gentext key="Glossary" text="&#23567;&#36781;&#24409;"/>
+ <gentext key="glossary" text="&#23567;&#36781;&#24409;"/>
+ <gentext key="GlossSee" text="&#21443;&#35211;"/>
+ <gentext key="glosssee" text="&#21443;&#35211;"/>
+ <gentext key="GlossSeeAlso" text="&#21478;&#21443;&#35211;"/>
+ <gentext key="glossseealso" text="&#21478;&#21443;&#35211;"/>
+ <gentext key="Important" text="&#37325;&#35201;"/>
+ <gentext key="important" text="&#37325;&#35201;"/>
+ <gentext key="index" text="&#32034;&#24341;"/>
+ <gentext key="Index" text="&#32034;&#24341;"/>
+ <gentext key="isbn" text="ISBN"/>
+ <gentext key="legalnotice" text="&#27861;&#24459;&#32882;&#26126;"/>
+ <gentext key="LegalNotice" text="&#27861;&#24459;&#32882;&#26126;"/>
+ <gentext key="MsgAud" text="&#35712;&#32773;"/>
+ <gentext key="msgaud" text="&#35712;&#32773;"/>
+ <gentext key="MsgLevel" text="&#31243;&#24230;"/>
+ <gentext key="msglevel" text="&#31243;&#24230;"/>
+ <gentext key="MsgOrig" text="&#20986;&#34389;"/>
+ <gentext key="msgorig" text="&#20986;&#34389;"/>
+ <gentext key="Note" text="&#27880;"/>
+ <gentext key="note" text="&#27880;"/>
+ <gentext key="Part" text="&#37096;"/>
+ <gentext key="part" text="&#37096;"/>
+ <gentext key="preface" text="&#24207;&#35328;"/>
+ <gentext key="Preface" text="&#24207;&#35328;"/>
+ <gentext key="procedure" text="&#36942;&#31243;"/>
+ <gentext key="Procedure" text="&#36942;&#31243;"/>
+ <gentext key="published" text="&#20986;&#29256;"/>
+ <gentext key="Published" text="&#20986;&#29256;"/>
+ <gentext key="Question" text="&#21839;&#65306;"/>
+ <gentext key="question" text="&#21839;&#65306;"/>
+ <gentext key="RefEntry" text="&#21443;&#29031;&#38917;&#30446;"/>
+ <gentext key="refentry" text="&#21443;&#29031;&#38917;&#30446;"/>
+ <gentext key="reference" text="&#21443;&#32771;"/>
+ <gentext key="Reference" text="&#21443;&#32771;"/>
+ <gentext key="refname" text="&#21443;&#32771;&#21517;"/>
+ <gentext key="RefName" text="&#21443;&#32771;&#21517;"/>
+ <gentext key="refsection" text="&#21443;&#29031;&#31456;&#31680;"/>
+ <gentext key="RefSection" text="&#21443;&#29031;&#31456;&#31680;"/>
+ <gentext key="refsynopsisdiv" text="&#22823;&#32177;"/>
+ <gentext key="RefSynopsisDiv" text="&#22823;&#32177;"/>
+ <gentext key="revhistory" text="&#20462;&#35330;&#35352;&#37636;"/>
+ <gentext key="RevHistory" text="&#20462;&#35330;&#35352;&#37636;"/>
+ <gentext key="revision" text="&#20462;&#35330;"/>
+ <gentext key="Revision" text="&#20462;&#35330;"/>
+ <gentext key="Section" text="&#31680;"/>
+ <gentext key="section" text="&#31680;"/>
+ <gentext key="See" text="&#35211;"/>
+ <gentext key="see" text="&#35211;"/>
+ <gentext key="seealso" text="&#21478;&#35211;"/>
+ <gentext key="SeeAlso" text="&#21478;&#35211;"/>
+ <gentext key="Seealso" text="&#21478;&#35211;"/>
+ <gentext key="set" text="Set"/>
+ <gentext key="Set" text="Set"/>
+ <gentext key="setindex" text="Set Index"/>
+ <gentext key="SetIndex" text="Set Index"/>
+ <gentext key="sidebar" text=""/>
+ <gentext key="Sidebar" text=""/>
+ <gentext key="step" text="&#27493;&#39519;"/>
+ <gentext key="Table" text="&#34920;&#26684;"/>
+ <gentext key="table" text="&#34920;&#26684;"/>
+ <gentext key="tip" text="&#25552;&#31034;"/>
+ <gentext key="Tip" text="&#25552;&#31034;"/>
+ <gentext key="warning" text="&#35686;&#21578;"/>
+ <gentext key="Warning" text="&#35686;&#21578;"/>
+ <gentext key="TableofContents" text="&#20839;&#23481;&#30446;&#37636;"/>
+ <gentext key="in" text="&#22312;"/>
+ <gentext key="by" text="&#30001;"/>
+ <gentext key="Edited" text="&#32232;&#36655;"/>
+ <gentext key="Editedby" text="&#32232;&#36655;"/>
+ <gentext key="and" text="&#19988;"/>
+ <gentext key="Notes" text="&#27880;"/>
+ <gentext key="TableNotes" text="&#27880;&#37323;"/>
+ <gentext key="nonexistantelement" text="&#19981;&#23384;&#22312;&#30340;&#20803;&#32032;"/>
+ <gentext key="Pgs" text="&#38913;"/>
+ <gentext key="page.citation" text="&#38913;"/>
+ <gentext key="unsupported" text="&#26410;&#25903;&#25588;"/>
+ <gentext key="xrefto" text="&#21443;&#29031;"/>
+ <gentext key="unexpectedelementname" text="&#38750;&#38928;&#26399;&#30340;&#20803;&#32032;&#21517;"/>
+ <gentext key="Revisedby" text="&#20462;&#35330;"/>
+ <gentext key="ListofTables" text="&#38468;&#34920;&#30446;&#37636;"/>
+ <gentext key="ListofExamples" text="&#31684;&#20363;&#30446;&#37636;"/>
+ <gentext key="ListofFigures" text="&#38468;&#22294;&#30446;&#37636;"/>
+ <gentext key="ListofEquations" text="&#20844;&#24335;&#30446;&#37636;"/>
+ <gentext key="ListofUnknown" text="&#20854;&#23427;&#20839;&#23481;&#30446;&#37636;"/>
+ <gentext key="nav-prev" text="&#21069;&#19968;&#38913;"/>
+ <gentext key="nav-prev-sibling" text="&#24555;&#36895;&#21521;&#21069;"/>
+ <gentext key="nav-next-sibling" text="&#24555;&#36895;&#21521;&#24460;"/>
+ <gentext key="nav-next" text="&#19979;&#19968;&#38913;"/>
+ <gentext key="nav-up" text="&#19978;&#19968;&#23652;"/>
+ <gentext key="nav-home" text="&#20839;&#23481;"/>
+ <dingbat key="startquote" text="&#34;"/>
+ <dingbat key="endquote" text="&#34;"/>
+ <dingbat key="nestedstartquote" text="'"/>
+ <dingbat key="nestedendquote" text="'"/>
+ <dingbat key="bullet" text="&#8226;"/>
-<gentext key="ListofTables" text="&#x9644;&#x8868;&#x76EE;&#x9304;"/>
-<gentext key="ListofExamples" text="&#x7BC4;&#x4F8B;&#x76EE;&#x9304;"/>
-<gentext key="ListofFigures" text="&#x9644;&#x5716;&#x76EE;&#x9304;"/>
-<gentext key="ListofEquations" text="&#x516C;&#x5F0F;&#x76EE;&#x9304;"/>
-<gentext key="ListofUnknown" text="&#x5176;&#x5B83;&#x5167;&#x5BB9;&#x76EE;&#x9304;"/>
+ <context name="title">
+ <template name="abstract" text="%t"/>
+ <template name="appendix" text="&#38468;&#37636; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="authorblurb" text="%t"/>
+ <template name="bibliodiv" text="%t"/>
+ <template name="biblioentry" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="bibliomixed" text="%t"/>
+ <template name="bibliomset" text="%t"/>
+ <template name="biblioset" text="%t"/>
+ <template name="blockquote" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="calloutlist" text="%t"/>
+ <template name="caution" text="%t"/>
+ <template name="chapter" text="&#31456; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="equation" text="&#26041;&#31243;&#24335; %n. %t"/>
+ <template name="example" text="&#31684;&#20363; %n. %t"/>
+ <template name="figure" text="&#22294;&#24418; %n. %t"/>
+ <template name="formalpara" text="%t"/>
+ <template name="glossary" text="%t"/>
+ <template name="glossdiv" text="%t"/>
+ <template name="important" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="indexdiv" text="%t"/>
+ <template name="itemizedlist" text="%t"/>
+ <template name="legalnotice" text="%t"/>
+ <template name="lot" text="%t"/>
+ <template name="msg" text="%t"/>
+ <template name="msgexplan" text="%t"/>
+ <template name="msgmain" text="%t"/>
+ <template name="msgrel" text="%t"/>
+ <template name="msgset" text="%t"/>
+ <template name="msgsub" text="%t"/>
+ <template name="note" text="%t"/>
+ <template name="orderedlist" text="%t"/>
+ <template name="part" text="&#37096; %n. %t"/>
+ <template name="partintro" text="%t"/>
+ <template name="preface" text="%t"/>
+ <template name="procedure" text="%t"/>
+ <template name="qandadiv" text="%t"/>
+ <template name="qandaset" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="refsect1" text="%t"/>
+ <template name="refsect2" text="%t"/>
+ <template name="refsect3" text="%t"/>
+ <template name="refsynopsisdiv" text="%t"/>
+ <template name="refsynopsisdivinfo" text="%t"/>
+ <template name="segmentedlist" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="sidebar" text="%t"/>
+ <template name="step" text="%t"/>
+ <template name="table" text="&#34920;&#26684; %n. %t"/>
+ <template name="tip" text="%t"/>
+ <template name="toc" text="%t"/>
+ <template name="variablelist" text="%t"/>
+ <template name="warning" text="%t"/>
+ </context>
-<gentext key="nav-prev" text="&#x524D;&#x4E00;&#x9801;"/>
-<gentext key="nav-prev-sibling" text="&#x5FEB;&#x901F;&#x5411;&#x524D;"/>
-<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x5411;&#x5F8C;"/>
-<gentext key="nav-next" text="&#x4E0B;&#x4E00;&#x9801;"/>
-<gentext key="nav-up" text="&#x4E0A;&#x4E00;&#x5C64;"/>
-<gentext key="nav-home" text="&#x5167;&#x5BB9;"/>
+ <context name="section-title">
+ <template name="sect1" text="%t"/>
+ <template name="sect2" text="%t"/>
+ <template name="sect3" text="%t"/>
+ <template name="sect4" text="%t"/>
+ <template name="sect5" text="%t"/>
+ <template name="section" text="%t"/>
+ <template name="simplesect" text="%t"/>
+ </context>
-<dingbat key="startquote" text="&quot;"/>
-<dingbat key="endquote" text="&quot;"/>
-<dingbat key="nestedstartquote" text="'"/>
-<dingbat key="nestedendquote" text="'"/>
-<dingbat key="bullet" text="&#2022;"/>
+ <context name="section-title-numbered">
+ <template name="sect1" text="%n. %t"/>
+ <template name="sect2" text="%n. %t"/>
+ <template name="sect3" text="%n. %t"/>
+ <template name="sect4" text="%n. %t"/>
+ <template name="sect5" text="%n. %t"/>
+ <template name="section" text="%n. %t"/>
+ <template name="simplesect" text="%n. %t"/>
+ </context>
-<xref element="appendix" text="%g %n"/>
-<xref element="chapter" text="%g %n"/>
-<xref element="dedication" text="%t"/>
-<xref element="preface" text="%t"/>
-<xref element="bibliography" text="%t"/>
-<xref element="glossary" text="%t"/>
-<xref element="index" text="%t"/>
+ <context name="subtitle">
+ <template name="appendix" text="%s"/>
+ <template name="article" text="%s"/>
+ <template name="bibliodiv" text="%s"/>
+ <template name="biblioentry" text="%s"/>
+ <template name="bibliography" text="%s"/>
+ <template name="bibliomixed" text="%s"/>
+ <template name="bibliomset" text="%s"/>
+ <template name="biblioset" text="%s"/>
+ <template name="book" text="%s"/>
+ <template name="chapter" text="%s"/>
+ <template name="colophon" text="%s"/>
+ <template name="dedication" text="%s"/>
+ <template name="glossary" text="%s"/>
+ <template name="glossdiv" text="%s"/>
+ <template name="index" text="%s"/>
+ <template name="indexdiv" text="%s"/>
+ <template name="lot" text="%s"/>
+ <template name="part" text="%s"/>
+ <template name="partintro" text="%s"/>
+ <template name="preface" text="%s"/>
+ <template name="refentry" text="%s"/>
+ <template name="reference" text="%s"/>
+ <template name="refsect1" text="%s"/>
+ <template name="refsect2" text="%s"/>
+ <template name="refsect3" text="%s"/>
+ <template name="refsynopsisdiv" text="%s"/>
+ <template name="sect1" text="%s"/>
+ <template name="sect2" text="%s"/>
+ <template name="sect3" text="%s"/>
+ <template name="sect4" text="%s"/>
+ <template name="sect5" text="%s"/>
+ <template name="section" text="%s"/>
+ <template name="set" text="%s"/>
+ <template name="setindex" text="%s"/>
+ <template name="sidebar" text="%s"/>
+ <template name="simplesect" text="%s"/>
+ <template name="toc" text="%s"/>
+ </context>
+ <context name="xref">
+ <template name="appendix" text="&#38468;&#37636; %n. %t"/>
+ <template name="article" text="%t"/>
+ <template name="bibliography" text="%t"/>
+ <template name="book" text="%t"/>
+ <template name="chapter" text="&#31456; %n. %t"/>
+ <template name="colophon" text="%t"/>
+ <template name="dedication" text="%t"/>
+ <template name="example" text="&#31684;&#20363; %n. %t"/>
+ <template name="figure" text="&#22294;&#24418; %n. %t"/>
+ <template name="glossary" text="%t"/>
+ <template name="index" text="%t"/>
+ <template name="part" text="&#37096; %n. %t"/>
+ <template name="preface" text="%t"/>
+ <template name="reference" text="%t"/>
+ <template name="set" text="%t"/>
+ <template name="setindex" text="%t"/>
+ <template name="table" text="&#34920;&#26684; %n. %t"/>
+ </context>
+
+ <context name="section-xref">
+ <template name="sect1" text="&#8220;%t&#8221;"/>
+ <template name="sect2" text="&#8220;%t&#8221;"/>
+ <template name="sect3" text="&#8220;%t&#8221;"/>
+ <template name="sect4" text="&#8220;%t&#8221;"/>
+ <template name="sect5" text="&#8220;%t&#8221;"/>
+ <template name="section" text="&#8220;%t&#8221;"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="section-xref-numbered">
+ <template name="sect1" text="&#31680; %n"/>
+ <template name="sect2" text="&#31680; %n"/>
+ <template name="sect3" text="&#31680; %n"/>
+ <template name="sect4" text="&#31680; %n"/>
+ <template name="sect5" text="&#31680; %n"/>
+ <template name="section" text="&#31680; %n"/>
+ <template name="simplesect" text="&#8220;%t&#8221;"/>
+ </context>
+
+ <context name="authorgroup">
+ <template name="sep" text=","/>
+ <template name="sep2" text=" &#19988; "/>
+ <template name="seplast" text=", &#19988; "/>
+ </context>
+
+ <context name="glossary">
+ <template name="see" text="&#21443;&#35211; "/>
+ <template name="seealso" text="&#21478;&#21443;&#35211; "/>
+ </context>
+
+ <context name="msgset">
+ <template name="MsgLevel" text="&#31243;&#24230;: "/>
+ <template name="MsgOrig" text="&#20986;&#34389;: "/>
+ <template name="MsgAud" text="&#35712;&#32773;: "/>
+ </context>
</localization>
diff --git a/tests/docbook/doc/ChangeLog b/tests/docbook/doc/ChangeLog
new file mode 100644
index 00000000..9bcb9143
--- /dev/null
+++ b/tests/docbook/doc/ChangeLog
@@ -0,0 +1,11 @@
+2001-04-15 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * reference.css: New file.
+
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile, book.xsl, jrefhtml.xsl, reference.xsl:
+ New file.
+
+ * Makefile: Misc. cleanup in preparation for making a distrib
+
diff --git a/tests/docbook/doc/book.xsl b/tests/docbook/doc/book.xsl
new file mode 100644
index 00000000..ca7aa349
--- /dev/null
+++ b/tests/docbook/doc/book.xsl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="../html/chunk.xsl"/>
+
+<xsl:param name="toc.section.depth" select="'1'"/>
+
+<xsl:param name="html.stylesheet" select="'reference.css'"/>
+
+<xsl:template match="olink[@type='title']">
+ <xsl:variable name="xml"
+ select="document(unparsed-entity-uri(@targetdocent))"/>
+ <xsl:variable name="title" select="($xml/*/title[1]
+ |$xml/*/bookinfo/title[1]
+ |$xml/*/referenceinfo/title[1])[1]"/>
+ <i>
+ <a href="{@localinfo}">
+ <xsl:apply-templates select="$title/*|$title/text()"/>
+ </a>
+ </i>
+</xsl:template>
+
+<xsl:template match="bookinfo/copyright|reference/copyright"
+ mode="titlepage.mode">
+ <xsl:variable name="years" select="year"/>
+ <xsl:variable name="holders" select="holder"/>
+
+ <p class="{name(.)}">
+ <a href="copyright.html">
+ <xsl:call-template name="gentext.element.name"/>
+ </a>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="dingbat">
+ <xsl:with-param name="dingbat">copyright</xsl:with-param>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext.by"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+ <xsl:text>. </xsl:text>
+ <a href="warranty.html">No Warranty</a>
+ <xsl:text>.</xsl:text>
+ </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/doc/ch01s02.html b/tests/docbook/doc/ch01s02.html
new file mode 100644
index 00000000..5714eb56
--- /dev/null
+++ b/tests/docbook/doc/ch01s02.html
@@ -0,0 +1,67 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>A brief introduction to XSL</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="publishing.html" title="Chapter 1. DocBook XSL"><link rel="previous" href="publishing.html" title="Chapter 1. DocBook XSL"><link rel="next" href="ch01s03.html" title="XSL processing model"></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">A brief introduction to XSL</th></tr><tr><td width="20%" align="left"><a href="publishing.html">Prev</a>&nbsp;</td><th width="60%" align="center">Chapter 1. DocBook XSL</th><td width="20%" align="right">&nbsp;<a href="ch01s03.html">Next</a></td></tr></table><hr></div><p>XSL is both a transformation language and a
+ formatting language. The XSLT transformation part lets you
+ scan through a document's structure and rearrange its
+ content any way you like. You can write out the content
+ using a different set of XML tags, and generate text as
+ needed. For example, you can scan through a document to
+ locate all headings and then insert a generated table of
+ contents at the beginning of the document, at the same time
+ writing out the content marked up as HTML. XSL is also a
+ rich formatting language, letting you apply typesetting
+ controls to all components of your output. With a good
+ formatting backend, it is capable of producing high quality
+ printed pages.</p><p>An XSL stylesheet is written using XML syntax, and is
+ itself a well-formed XML document. That makes the basic
+ syntax familiar, and enables an XML processor to check for
+ basic syntax errors. The stylesheet instructions use
+ special element names, which typically begin with
+ <tt>xsl:</tt> to distinguish them from any XML
+ tags you want to appear in the output. The XSL namespace is
+ identified at the top of the stylesheet file. As with other
+ XML, any XSL elements that are not empty will require a
+ closing tag. And some XSL elements have specific attributes
+ that control their behavior. It helps to keep a good XSL
+ reference book handy.</p><p>Here is an example of a simple XSL stylesheet applied
+ to a simple XML file to generate HTML output.</p><div class="example"><p><a name="c44b1b3b5b5"></a><b>Example 1.1. Simple XML file</b></p><pre class="programlisting">&lt;?xml version="1.0"?&gt;
+&lt;document&gt;
+&lt;title&gt;Using a mouse&lt;/title&gt;
+&lt;para&gt;It's easy to use a mouse. Just roll it
+around and click the buttons.&lt;/para&gt;
+&lt;/document&gt;</pre></div><div class="example"><p><a name="c44b1b3b5b6"></a><b>Example 1.2. Simple XSL stylesheet</b></p><pre class="programlisting">&lt;?xml version='1.0'?&gt;
+&lt;xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'&gt;
+&lt;xsl:output method="html"/&gt;
+
+&lt;xsl:template match="document"&gt;
+ &lt;HTML&gt;&lt;HEAD&gt;&lt;TITLE&gt;
+ &lt;xsl:value-of select="./title"/&gt;
+ &lt;/TITLE&gt;
+ &lt;/HEAD&gt;
+ &lt;BODY&gt;
+ &lt;xsl:apply-templates/&gt;
+ &lt;/BODY&gt;
+ &lt;/HTML&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template match="title"&gt;
+ &lt;H1&gt;&lt;xsl:apply-templates/&gt;&lt;/H1&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template match="para"&gt;
+ &lt;P&gt;&lt;xsl:apply-templates/&gt;&lt;/P&gt;
+&lt;/xsl:template&gt;
+
+&lt;/xsl:stylesheet&gt;
+</pre></div><div class="example"><p><a name="c44b1b3b5b7"></a><b>Example 1.3. HTML output</b></p><pre class="programlisting">&lt;HTML&gt;
+&lt;HEAD&gt;
+&lt;TITLE&gt;Using a mouse&lt;/TITLE&gt;
+&lt;/HEAD&gt;
+&lt;BODY&gt;
+&lt;H1&gt;Using a mouse&lt;/H1&gt;
+&lt;P&gt;It's easy to use a mouse. Just roll it
+around and click the buttons.&lt;/P&gt;
+&lt;/BODY&gt;
+&lt;/HTML&gt;
+</pre></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="publishing.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch01s03.html">Next</a></td></tr><tr><td width="40%" align="left">Chapter 1. DocBook XSL&nbsp;</td><td width="20%" align="center"><a href="publishing.html">Up</a></td><td width="40%" align="right">&nbsp;XSL processing model</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/ch01s03.html b/tests/docbook/doc/ch01s03.html
new file mode 100644
index 00000000..f19dae4b
--- /dev/null
+++ b/tests/docbook/doc/ch01s03.html
@@ -0,0 +1,422 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>XSL processing model</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="publishing.html" title="Chapter 1. DocBook XSL"><link rel="previous" href="ch01s02.html" title="A brief introduction to XSL"><link rel="next" href="ch01s04.html" title="Customizing DocBook XSL stylesheets"></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">XSL processing model</th></tr><tr><td width="20%" align="left"><a href="ch01s02.html">Prev</a>&nbsp;</td><th width="60%" align="center">Chapter 1. DocBook XSL</th><td width="20%" align="right">&nbsp;<a href="ch01s04.html">Next</a></td></tr></table><hr></div><p>XSL is a template language, not a procedural
+language. That means a stylesheet specifies a sample of the
+output, not a sequence of programming steps to generate it.
+A stylesheet consists of a mixture of output samples with
+instructions of what to put in each sample. Each bit of
+output sample and instructions is called
+a <i>template</i>.</p><p>In general, you write a template for each element
+type in your document. That lets you concentrate on
+handling just one element at a time, and keeps a stylesheet
+modular. The power of XSL comes from processing the
+templates recursively. That is, each template handles the
+processing of its own element, and then calls other
+templates to process its children, and so on. Since an XML
+document is always a single root element at the top level
+that contains all of the nested descendent elements, the
+XSL templates also start at the top and work their way down
+through the hierarchy of elements.</p><p>Take the
+DocBook <tt>&lt;para&gt;</tt> paragraph element as
+an example. To convert this to HTML, you want to wrap the
+paragraph content with the HTML
+tags <tt>&lt;p&gt;</tt> and <tt>&lt;/p&gt;</tt>.
+But a DocBook <tt>&lt;para&gt;</tt> can contain
+any number of in-line DocBook elements marking up the text.
+Fortunately, you can let other templates take care of those
+elements, so your XSL template
+for <tt>&lt;para&gt;</tt> can be quite
+simple:</p><pre class="programlisting">&lt;xsl:template match="para"&gt;
+ &lt;p&gt;
+ &lt;xsl:apply-templates/&gt;
+ &lt;/p&gt;
+&lt;/xsl:template&gt;
+</pre><p>The <tt>&lt;xsl:template&gt;</tt> element
+starts a new template, and
+its <tt>match</tt> attribute indicates where to
+apply the template, in this case to
+any <tt>&lt;para&gt;</tt> elements. The template
+says to output a literal <tt>&lt;p&gt;</tt> string
+and then execute
+the <tt>&lt;xsl:apply-templates/&gt;</tt> instruction.
+This tells the XSL processor to look among all the
+templates in the stylesheet for any that should be applied
+to the content of the paragraph. If each template in the
+stylesheet includes
+an <tt>&lt;xsl:apply-templates/&gt;</tt> instruction,
+then all descendents will eventually be processed. When it
+is through recursively applying templates to the paragraph
+content, it outputs the <tt>&lt;/p&gt;</tt> closing
+tag.</p><div class="sect2"><a name="c44b1b3b6b7"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b6b7"></a>Context is important</h3></div></div><p>Since you aren't writing a linear procedure to
+process your document, the context of where and how to
+apply each modular template is important.
+The <tt>match</tt> attribute
+of <tt>&lt;xsl:template&gt;</tt> provides that
+context for most templates. There is an entire expression
+language, XPath, for identifying what parts of your
+document should be handled by each template. The simplest
+context is just an element name, as in the example above.
+But you can also specify elements as children of other
+elements, elements with certain attribute values, the first
+or last elements in a sequence, and so on. Here is how the
+DocBook <tt>&lt;formalpara&gt;</tt> element is
+handled:</p><pre class="programlisting">&lt;xsl:template match="formalpara"&gt;
+ &lt;p&gt;
+ &lt;xsl:apply-templates/&gt;
+ &lt;/p&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template match="formalpara/title"&gt;
+ &lt;b&gt;&lt;xsl:apply-templates/&gt;&lt;/b&gt;
+ &lt;xsl:text&gt; &lt;/xsl:text&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template match="formalpara/para"&gt;
+ &lt;xsl:apply-templates/&gt;
+&lt;/xsl:template&gt;
+</pre><p>There are three templates defined, one for
+the <tt>&lt;formalpara&gt;</tt> element itself,
+ and one for each of its children elements. The <tt>match</tt> attribute
+value <tt>formalpara/title</tt> in the second
+template is an XPath expression indicating
+a <tt>&lt;title&gt;</tt> element that is an
+immediate child of
+a <tt>&lt;formalpara&gt;</tt> element. This
+distinguishes such titles from
+other <tt>&lt;title&gt;</tt> elements used in
+DocBook. XPath expressions are the key to controlling how
+your templates are applied.</p><p>In general, the XSL processor has internal rules that
+apply templates that are more specific before templates
+that are less specific. That lets you control the details,
+but also provides a fallback mechanism to a less specific
+template when you don't supply the full context for every
+combination of elements. This feature is illustrated by the
+third template, for <tt>formalpara/para</tt>. By
+including this template, the stylesheet processes a <tt>&lt;para&gt;</tt> within <tt>&lt;formalpara&gt;</tt> in
+a special way, in this case by not outputting the HTML <tt>&lt;p&gt;</tt> tags already output by its parent. If this template had not been included, then the processor would have fallen back to the template
+specified by <tt>match="para"</tt> described
+above, which would have output a second set of <tt>&lt;p&gt;</tt> tags.</p><p>You can also control template context with
+XSL <i>modes</i>, which are used extensively
+in the DocBook stylesheets. Modes let you process the same
+input more than once in different ways.
+A <tt>mode</tt> attribute in
+an <tt>&lt;xsl:template&gt;</tt> definition adds a
+specific mode name to that template. When the same mode
+name is used
+in <tt>&lt;xsl:apply-templates/&gt;</tt>, it acts
+as a filter to narrow the selection of templates to only
+those selected by
+the <tt>match</tt> expression <i>and</i> that
+have that mode name. This lets you define two different
+templates for the same element match that are applied under
+different contexts. For example, there are two templates
+defined for
+DocBook <tt>&lt;listitem&gt;</tt> elements:</p><pre class="programlisting">&lt;xsl:template match="listitem"&gt;
+ &lt;li&gt;&lt;xsl:apply-templates/&gt;&lt;/li&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template match="listitem" mode="xref"&gt;
+ &lt;xsl:number format="1"/&gt;
+&lt;/xsl:template&gt;
+</pre><p>The first template is for the normal list item
+context where you want to output the
+HTML <tt>&lt;li&gt;</tt> tags. The second template
+is called with <tt>&lt;xsl:apply-templates
+select="$target" mode="xref"/&gt;</tt> in the context
+of processing <tt>&lt;xref&gt;</tt> elements. In
+this case the <tt>select</tt> attribute locates
+the ID of the specific list item and
+the <tt>mode</tt> attribute selects the second
+template, whose effect is to output its item number when it
+is in an ordered list. Because there are many such special
+needs when
+processing <tt>&lt;xref&gt;</tt> elements, it is
+convenient to define a mode name <tt>xref</tt> to
+handle them all. Keep in mind that mode settings
+do <i>not</i> automatically get passed down to
+other templates
+through <tt>&lt;xsl:apply-templates/&gt;</tt>.</p></div><div class="sect2"><a name="c44b1b3b6b8"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b6b8"></a>Programming features</h3></div></div><p>Although XSL is template-driven, it also has some
+features of traditional programming languages. Here are
+some examples from the DocBook stylesheets. </p><pre class="programlisting">Assign a value to a variable:
+&lt;xsl:variable name="refelem" select="name($target)"/&gt;
+
+If statement:
+&lt;xsl:if test="$show.comments"&gt;
+ &lt;i&gt;&lt;xsl:call-template name="inline.charseq"/&gt;&lt;/i&gt;
+&lt;/xsl:if&gt;
+
+Case statement:
+&lt;xsl:choose&gt;
+ &lt;xsl:when test="@columns"&gt;
+ &lt;xsl:value-of select="@columns"/&gt;
+ &lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;1&lt;/xsl:otherwise&gt;
+&lt;/xsl:choose&gt;
+
+Call a template by name like a subroutine, passing parameter values and accepting a return value:
+&lt;xsl:call-template name="xref.xreflabel"&gt;
+ &lt;xsl:with-param name="target" select="$target"/&gt;
+&lt;/xsl:call-template&gt;
+</pre><p>However, you can't always use these constructs as you
+do in other programming languages. Variables in particular
+have very different behavior.</p><div class="sect3"><a name="c44b1b3b6b8b5"></a><div class="titlepage"><div><h4 class="title"><a name="c44b1b3b6b8b5"></a>Using variables and parameters</h4></div></div><p>XSL provides two elements that let you assign a value
+to a
+name: <tt>&lt;xsl:variable&gt;</tt> and <tt>&lt;xsl:param&gt;</tt>.
+These share the same name space and syntax for assigning
+names and values. Both can be referred to using
+the <tt>$name</tt> syntax. The main difference
+between these two elements is that a param's value acts as
+a default value that can be overridden when a template is
+called using
+a <tt>&lt;xsl:with-param&gt;</tt> element as in the
+last example above.</p><p>Here are two examples from DocBook:</p><pre class="programlisting">&lt;xsl:param name="cols"&gt;1&lt;/xsl:param&gt;
+&lt;xsl:variable name="segnum" select="position()"/&gt;
+</pre><p>In both elements, the name of the parameter or
+variable is specified with
+the <tt>name</tt> attribute. So the name of
+the <tt>param</tt> here
+is <tt>cols</tt> and the name of
+the <tt>variable</tt> is <tt>segnum</tt>.
+The value of either can be supplied in two ways. The value
+of the first example is the text node "1" and is supplied
+as the content of the element. The value of the second
+example is supplied as the result of the expression in
+its <tt>select</tt> attribute, and the element
+itself has no content.</p><p>The feature of XSL variables that is odd to new users
+is that once you assign a value to a variable, you cannot
+assign a new value within the same scope. Doing so will
+generate an error. So variables are not used as dynamic
+storage bins they way they are in other languages. They
+hold a fixed value within their scope of application, and
+then disappear when the scope is exited. This feature is a
+result of the design of XSL, which is template-driven and
+not procedural. This means there is no definite order of
+processing, so you can't rely on the values of changing
+variables. To use variables in XSL, you need to understand
+how their scope is defined.</p><p>Variables defined outside of all templates are
+considered global variables, and they are readable within
+all templates. The value of a global variable is fixed, and
+its global value can't be altered from within any template.
+However, a template can create a local variable of the same
+name and give it a different value. That local value
+remains in effect only within the scope of the local
+variable.</p><p>Variables defined within a template remain in effect
+only within their permitted scope, which is defined as all
+following siblings and their descendants. To understand
+such a scope, you have to remember that XSL instructions
+are true XML elements that are embedded in an XML family
+hierarchy of XSL elements, often referred to as parents,
+children, siblings, ancestors and descendants. Taking the
+family analogy a step further, think of a variable
+assignment as a piece of advice that you are allowed to
+give to certain family members. You can give your advice
+only to your younger siblings (those that follow you) and
+their descendents. Your older siblings won't listen,
+neither will your parents or any of your ancestors. To
+stretch the analogy a bit, it is an error to try to give
+different advice under the same name to the same group of
+listeners (in other words, to redefine the variable). Keep
+in mind that this family is not the elements of your
+document, but just the XSL instructions in your stylesheet.
+To help you keep track of such scopes in hand-written
+stylesheets, it helps to indent nested XSL elements. Here
+is an edited snippet from the DocBook stylesheet
+file <tt>pi.xsl</tt> that illustrates different
+scopes for two variables:</p><pre class="programlisting">
+ 1 &lt;xsl:template name="dbhtml-attribute"&gt;
+ 2 ...
+ 3 &lt;xsl:choose&gt;
+ 4 &lt;xsl:when test="$count&gt;count($pis)"&gt;
+ 5 &lt;!-- not found --&gt;
+ 6 &lt;/xsl:when&gt;
+ 7 &lt;xsl:otherwise&gt;
+ 8 &lt;xsl:variable name="pi"&gt;
+ 9 &lt;xsl:value-of select="$pis[$count]"/&gt;
+10 &lt;/xsl:variable&gt;
+11 &lt;xsl:choose&gt;
+12 &lt;xsl:when test="contains($pi,concat($attribute, '='))"&gt;
+13 &lt;xsl:variable name="rest" select="substring-after($pi,concat($attribute,'='))"/&gt;
+14 &lt;xsl:variable name="quote" select="substring($rest,1,1)"/&gt;
+15 &lt;xsl:value-of select="substring-before(substring($rest,2),$quote)"/&gt;
+16 &lt;/xsl:when&gt;
+17 &lt;xsl:otherwise&gt;
+18 ...
+19 &lt;/xsl:otherwise&gt;
+20 &lt;/xsl:choose&gt;
+21 &lt;/xsl:otherwise&gt;
+22 &lt;/xsl:choose&gt;
+23 &lt;/xsl:template&gt;
+
+</pre><p>The scope of the variable <tt>pi</tt> begins
+on line 8 where it is defined in this template, and ends on
+line 20 when its last sibling ends.<sup>[<a name="c44b1b3b6b8b5c10b4" href="#ftn.c44b1b3b6b8b5c10b4">1</a>]</sup> The scope of the
+variable <tt>rest</tt> begins on line 13 and ends
+on line 15. Fortunately, line 15 outputs an expression
+using the value before it goes out of scope.</p><p>What happens when
+an <tt>&lt;xsl:apply-templates/&gt;</tt> element
+is used within the scope of a local variable? Do the
+templates that are applied to the document children get the
+variable? The answer is no. The templates that are applied
+are not actually within the scope of the variable. They
+exist elsewhere in the stylesheet and are not following
+siblings or their descendants. </p><p>To pass a value to another template, you pass a
+parameter using
+the <tt>&lt;xsl:with-param&gt;</tt> element. This
+parameter passing is usually done with calls to a specific
+named template
+using <tt>&lt;xsl:call-template&gt;</tt>, although
+it works
+with <tt>&lt;xsl:apply-templates&gt;</tt> too.
+That's because the called template must be expecting the
+parameter by defining it using
+a <tt>&lt;xsl:param&gt;</tt> element with the same
+parameter name. Any passed parameters whose names are not
+defined in the called template are ignored.</p><p>Here is an example of parameter passing
+from <tt>docbook.xsl</tt>:</p><pre class="programlisting">&lt;xsl:call-template name="head.content"&gt;
+ &lt;xsl:with-param name="node" select="$doc"/&gt;
+&lt;/xsl:call-template&gt;
+</pre><p>Here a template
+named <tt>head.content</tt> is being called and
+passed a parameter named <tt>node</tt> whose
+content is the value of the <tt>$doc</tt> variable
+in the current context. The top of that template looks like
+this:</p><pre class="programlisting">&lt;xsl:template name="head.content"&gt;
+ &lt;xsl:param name="node" select="."/&gt;
+</pre><p>The template is expecting the parameter because it
+has a <tt>&lt;xsl:param&gt;</tt> defined with the
+same name. The value in this definition is the default
+value. This would be the parameter value used in the
+template if the template was called without passing that
+parameter.</p></div></div><div class="sect2"><a name="c44b1b3b6b9"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b6b9"></a>Generating HTML output.</h3></div></div><p>You generate HTML from your DocBook XML files by
+applying the HTML version of the stylesheets. This is done
+by using the HTML driver
+file <tt>docbook/html/docbook.xsl</tt> as your
+stylesheet. That is the master stylesheet file that
+uses <tt>&lt;xsl:include&gt;</tt> to pull in the
+component files it needs to assemble a complete stylesheet
+for producing HTML. </p><p>The way the DocBook stylesheet generates HTML is to
+apply templates that output a mix of text content and HTML
+elements. Starting at the top level in the main
+file <tt>docbook.xsl</tt>:</p><pre class="programlisting">&lt;xsl:template match="/"&gt;
+ &lt;xsl:variable name="doc" select="*[1]"/&gt;
+ &lt;html&gt;
+ &lt;head&gt;
+ &lt;xsl:call-template name="head.content"&gt;
+ &lt;xsl:with-param name="node" select="$doc"/&gt;
+ &lt;/xsl:call-template&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
+ &lt;xsl:apply-templates/&gt;
+ &lt;/body&gt;
+ &lt;/html&gt;
+&lt;/xsl:template&gt;
+</pre><p>This template matches the root element of your input
+document, and starts the process of recursively applying
+templates. It first defines a variable
+named <tt>doc</tt> and then outputs two literal
+HTML elements <tt>&lt;html&gt;</tt> and <tt>&lt;head&gt;</tt>.
+Then it calls a named
+template <tt>head.content</tt> to process the
+content of the HTML <tt>&lt;head&gt;</tt>, closes
+the <tt>&lt;head&gt;</tt> and starts
+the <tt>&lt;body&gt;</tt>. There it
+uses <tt>&lt;xsl:apply-templates/&gt;</tt> to
+recursively process the entire input document. Then it just
+closes out the HTML file.</p><p>Simple HTML elements can generated as literal
+elements as shown here. But if the HTML being output
+depends on the context, you need something more powerful to
+select the element name and possibly add attributes and
+their values. Here is a fragment
+from <tt>sections.xsl</tt> that shows how a
+heading tag is generated using
+the <tt>&lt;xsl:element&gt;</tt> and <tt>&lt;xsl:attribute&gt;</tt> elements:</p><pre class="programlisting">
+ 1 &lt;xsl:element name="h{$level}"&gt;
+ 2 &lt;xsl:attribute name="class"&gt;title&lt;/xsl:attribute&gt;
+ 3 &lt;xsl:if test="$level&lt;3"&gt;
+ 4 &lt;xsl:attribute name="style"&gt;clear: all&lt;/xsl:attribute&gt;
+ 5 &lt;/xsl:if&gt;
+ 6 &lt;a&gt;
+ 7 &lt;xsl:attribute name="name"&gt;
+ 8 &lt;xsl:call-template name="object.id"/&gt;
+ 9 &lt;/xsl:attribute&gt;
+10 &lt;b&gt;&lt;xsl:copy-of select="$title"/&gt;&lt;/b&gt;
+11 &lt;/a&gt;
+12 &lt;/xsl:element&gt;
+</pre><p>This whole example is generating a single HTML
+heading element. Line 1 begins the HTML element definition
+by identifying the name of the element. In this case, the
+name is an expression that includes the
+variable <tt>$level</tt> passed as a parameter to
+this template. Thus a single template can
+generate <tt>&lt;h1&gt;</tt>, <tt>&lt;h2&gt;</tt>,
+etc. depending on the context in which it is called. Line 2
+defines a <tt>class="title"</tt> attribute that is
+added to this element. Lines 3 to 5 add
+a <tt>style="clear all"</tt> attribute, but only
+if the heading level is less than 3. Line 6 opens
+an <tt>&lt;a&gt;</tt> anchor element. Although this
+looks like a literal output string, it is actually modified
+by lines 7 to 9 that insert
+the <tt>name</tt> attribute into
+the <tt>&lt;a&gt;</tt> element. This illustrates
+that XSL is managing output elements as active element
+nodes, not just text strings. Line 10 outputs the text of
+the heading title, also passed as a parameter to the
+template, enclosed in HTML boldface tags. Line 11 closes
+the anchor tag with the
+literal <tt>&lt;/a&gt;</tt> syntax, while line 12
+closes the heading tag by closing the element definition.
+Since the actual element name is a variable, it couldn't
+use the literal syntax.</p><p>As you follow the sequence of nested templates
+processing elements, you might be wondering how the
+ordinary text of your input document gets to the output. In
+the file <tt>docbook.xsl</tt> you will find
+this template that handles any text not processed by any
+other template:</p><pre class="programlisting">&lt;xsl:template match="text()"&gt;
+ &lt;xsl:value-of select="."/&gt;
+&lt;/xsl:template&gt;
+</pre><p>This template's body consists of the "value" of the text node,
+which is just its text. In general, all XSL processors have
+some built-in templates to handle any content for which
+your stylesheet doesn't supply a matching template. This
+template serves the same function but appears explicitly in
+the stylesheet.</p></div><div class="sect2"><a name="c44b1b3b6c10"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b6c10"></a>Generating formatting objects.</h3></div></div><p>You generate formatting objects from your DocBook XML
+files by applying the fo version of the stylesheets. This
+is done by using the fo driver
+file <tt>docbook/fo/docbook.xsl</tt> as your
+stylesheet. That is the master stylesheet file that
+uses <tt>&lt;xsl:include&gt;</tt> to pull in the
+component files it needs to assemble a complete stylesheet
+for producing formatting objects. Generating a formatting
+objects file is only half the process of producing typeset
+output. You also need a formatting object processor such as
+the Apache XML Project's FOP as described in an earlier
+section.</p><p>The DocBook fo stylesheet works in a similar manner
+to the HTML stylesheet. Instead of outputting HTML tags, it
+outputs text marked up
+with <tt>&lt;fo:<i><tt>something</tt></i>&gt;</tt> tags.
+For example, to indicate that some text should be kept
+in-line and typeset with a monospace font, it might look
+like this:</p><pre class="programlisting">&lt;fo:inline-sequence font-family="monospace"&gt;/usr/man&lt;/fo:inline-sequence&gt;</pre><p>The templates
+in <tt>docbook/fo/inline.xsl</tt> that produce
+this output for a
+DocBook <tt>&lt;filename&gt;</tt> element look
+like this:</p><pre class="programlisting">&lt;xsl:template match="filename"&gt;
+ &lt;xsl:call-template name="inline.monoseq"/&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template name="inline.monoseq"&gt;
+ &lt;xsl:param name="content"&gt;
+ &lt;xsl:apply-templates/&gt;
+ &lt;/xsl:param&gt;
+ &lt;fo:inline-sequence font-family="monospace"&gt;
+ &lt;xsl:copy-of select="$content"/&gt;
+ &lt;/fo:inline-sequence&gt;
+&lt;/xsl:template&gt;
+</pre><p>There are dozens of fo tags and attributes specified
+in the XSL standard. It is beyond the scope of this
+document to cover how all of them are used in the DocBook
+stylesheets. Fortunately, this is only an intermediate
+format that you probably won't have to deal with very much
+directly unless you are writing your own
+stylesheets.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="ch01s02.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch01s04.html">Next</a></td></tr><tr><td width="40%" align="left">A brief introduction to XSL&nbsp;</td><td width="20%" align="center"><a href="publishing.html">Up</a></td><td width="40%" align="right">&nbsp;Customizing DocBook XSL stylesheets</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/ch01s04.html b/tests/docbook/doc/ch01s04.html
new file mode 100644
index 00000000..9eb3ab63
--- /dev/null
+++ b/tests/docbook/doc/ch01s04.html
@@ -0,0 +1,250 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Customizing DocBook XSL stylesheets</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="publishing.html" title="Chapter 1. DocBook XSL"><link rel="previous" href="ch01s03.html" title="XSL processing model"><link rel="next" href="extensions.html" title="Chapter 2. Saxon Extensions"></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">Customizing DocBook XSL stylesheets</th></tr><tr><td width="20%" align="left"><a href="ch01s03.html">Prev</a>&nbsp;</td><th width="60%" align="center">Chapter 1. DocBook XSL</th><td width="20%" align="right">&nbsp;<a href="extensions.html">Next</a></td></tr></table><hr></div><p>The DocBook XSL stylesheets are written in a modular
+fashion. Each of the HTML and FO stylesheets starts with a
+driver file that assembles a collection of component files
+into a complete stylesheet. This modular design puts similar things together into smaller files that are easier to write and maintain than one big stylesheet. The modular stylesheet files
+are distributed among four directories:</p><div class="variablelist"><dl><dt><a name="c44b1b3b7b3b1"></a><span class="term">common/</span></dt><dd><p><a name="c44b1b3b7b3b1b2"></a>contains code common to both stylesheets, including localization data
+</p></dd><dt><a name="c44b1b3b7b3b2"></a><span class="term">fo/</span></dt><dd><p><a name="c44b1b3b7b3b2b2"></a>a stylesheet that produces XSL FO result trees
+</p></dd><dt><a name="c44b1b3b7b3b3"></a><span class="term">html/</span></dt><dd><p><a name="c44b1b3b7b3b3b2"></a>a stylesheet that produces HTML/XHTML result trees
+</p></dd><dt><a name="c44b1b3b7b3b4"></a><span class="term">lib/</span></dt><dd><p><a name="c44b1b3b7b3b4b2"></a>contains schema-independent functions
+</p></dd></dl></div><p>The driver files for each of HTML and FO stylesheets
+are <tt>html/docbook.xsl</tt> and <tt>fo/docbook.xsl</tt>,
+respectively. A driver file consists mostly of a bunch
+of <tt>&lt;xsl:include&gt;</tt> instructions to
+pull in the component templates, and then defines some
+top-level templates. For example:</p><pre class="programlisting">&lt;xsl:include href="../VERSION"/&gt;
+&lt;xsl:include href="../lib/lib.xsl"/&gt;
+&lt;xsl:include href="../common/l10n.xsl"/&gt;
+&lt;xsl:include href="../common/common.xsl"/&gt;
+&lt;xsl:include href="autotoc.xsl"/&gt;
+&lt;xsl:include href="lists.xsl"/&gt;
+&lt;xsl:include href="callout.xsl"/&gt;
+...
+&lt;xsl:include href="param.xsl"/&gt;
+&lt;xsl:include href="pi.xsl"/&gt;
+</pre><p>The first four modules are shared with the FO
+stylesheet and are referenced using relative pathnames to
+the common directories. Then the long list of component
+stylesheets starts. Pathnames in include statements are
+always taken to be relative to the including file. Each
+included file must be a valid XSL stylesheet, which means
+its root element must
+be <tt>&lt;xsl:stylesheet&gt;</tt>.</p><div class="sect2"><a name="c44b1b3b7b7"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7b7"></a>Stylesheet inclusion vs. importing</h3></div></div><p>XSL actually provides two inclusion
+mechanisms: <tt>&lt;xsl:include&gt;</tt> and <tt>&lt;xsl:import&gt;</tt>.
+Of the two, <tt>&lt;xsl:include&gt;</tt> is
+the simpler. It treats the included content as if it were
+actually typed into the file at that point, and doesn't
+give it any more or less precedence relative to the
+surrounding text. It is best used when assembling
+dissimilar templates that don't overlap what they match.
+The DocBook driver files use this instruction to assemble a
+set of modules into a stylesheet.</p><p>In contrast, <tt>&lt;xsl:import&gt;</tt> lets
+you manage the precedence of templates and variables. It is
+the preferred mode of customizing another stylesheet because
+it lets you override definitions in the distributed
+stylesheet with your own, without altering the distribution
+files at all. You simply import the whole stylesheet and
+add whatever changes you want.</p><p>The precedence rules for import are detailed and
+rigorously defined in the XSL standard. The basic rule is
+that any templates and variables in the importing
+stylesheet have precedence over equivalent templates and
+variables in the imported stylesheet. Think of the imported stylesheet elements as a fallback collection, to be used only if a match is not found in the current stylesheet. You can customize the templates you want to change in your stylesheet file, and let the imported stylesheet handle the rest.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="c44b1b3b7b7b5"></a>Note</h3><p>Customizing a DocBook XSL stylesheet is the opposite
+of customizing a DocBook DTD. When you customize a DocBook
+DTD, the rules of XML and SGML dictate that
+the <i>first</i> of any duplicate declarations
+wins. Any subsequent declarations of the same element or
+entity are ignored. The architecture of the DTD provides
+slots for inserting your own custom declarations early
+enough in the DTD for them to override the standard
+declarations. In contrast, customizing an XSL stylesheet is
+simpler because your definitions have precedence over imported ones.</p></div><p>You can carry modularization to deeper levels because
+module files can also include or import other modules.
+You'll need to be careful to maintain the precedence that
+you want as the modules get rolled up into a complete
+stylesheet. </p></div><div class="sect2"><a name="c44b1b3b7b8"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7b8"></a>Customizing
+with <tt>&lt;xsl:import&gt;</tt></h3></div></div><p>There is currently one example of customizing
+with <tt>&lt;xsl:import&gt;</tt> in the HTML
+version of the DocBook stylesheets.
+The <tt>xtchunk.xsl</tt> stylesheet modifies the
+HTML processing to output many smaller HTML files rather
+than a single large file per input document. It uses XSL
+extensions defined only in the XSL
+processor <b>XT</b>. In the driver
+file <tt>xtchunk.xsl</tt>, the first instruction
+is <tt>&lt;xsl:import
+href="docbook.xsl"/&gt;</tt>. That instruction imports
+the original driver file, which in turn uses
+many <tt>&lt;xsl:include&gt;</tt> instructions to
+include all the modules. That single import instruction
+gives the new stylesheet the complete set of DocBook
+templates to start with.</p><p>After the
+import, <tt>xtchunk.xsl</tt> redefines some of
+the templates and adds some new ones. Here is one example
+of a redefined template:</p><pre class="programlisting">Original template in autotoc.xsl
+&lt;xsl:template name="href.target"&gt;
+ &lt;xsl:param name="object" select="."/&gt;
+ &lt;xsl:text&gt;#&lt;/xsl:text&gt;
+ &lt;xsl:call-template name="object.id"&gt;
+ &lt;xsl:with-param name="object" select="$object"/&gt;
+ &lt;/xsl:call-template&gt;
+&lt;/xsl:template&gt;
+
+New template in xtchunk.xsl
+&lt;xsl:template name="href.target"&gt;
+ &lt;xsl:param name="object" select="."/&gt;
+ &lt;xsl:variable name="ischunk"&gt;
+ &lt;xsl:call-template name="chunk"&gt;
+ &lt;xsl:with-param name="node" select="$object"/&gt;
+ &lt;/xsl:call-template&gt;
+ &lt;/xsl:variable&gt;
+
+ &lt;xsl:apply-templates mode="chunk-filename" select="$object"/&gt;
+
+ &lt;xsl:if test="$ischunk='0'"&gt;
+ &lt;xsl:text&gt;#&lt;/xsl:text&gt;
+ &lt;xsl:call-template name="object.id"&gt;
+ &lt;xsl:with-param name="object" select="$object"/&gt;
+ &lt;/xsl:call-template&gt;
+ &lt;/xsl:if&gt;
+&lt;/xsl:template&gt;
+</pre><p>The new template handles the more complex processing
+of HREFs when the output is split into many HTML files.
+Where the old template could simply
+output <tt>#<i><tt>object.id</tt></i></tt>,
+the new one outputs <tt><i><tt>filename</tt></i>#<i><tt>object.id</tt></i></tt>.</p></div><div class="sect2"><a name="c44b1b3b7b9"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7b9"></a>Setting stylesheet variables</h3></div></div><p>You may not have to define any new templates,
+however. The DocBook stylesheets are parameterized using
+XSL variables rather than hard-coded values for many of the
+formatting features. Since
+the <tt>&lt;xsl:import&gt;</tt> mechanism also
+lets you redefine global variables, this gives you an easy
+way to customize many features of the DocBook
+stylesheets. Over time, more features will be parameterized to permit customization. If you find hardcoded values in the stylesheets that would be useful to customize, please let the maintainer know.</p><p>Near the end of the list of includes in the main
+DocBook driver file is the
+instruction <tt>&lt;xsl:include
+href="param.xsl"/&gt;</tt>.
+The <tt>param.xsl</tt> file is the most
+important module for customizing a DocBook XSL stylesheet.
+This module contains no templates, only definitions of
+stylesheet variables. Since these variables are defined
+outside of any template, they are global variables and
+apply to the entire stylesheet. By redefining these
+variables in an importing stylesheet, you can change the
+behavior of the stylesheet.</p><p>To create a customized DocBook stylesheet, you simply
+create a new stylesheet file such
+as <tt>mystyle.xsl</tt> that imports the standard
+stylesheet and adds your own new variable definitions. Here
+is an example of a complete custom stylesheet that changes
+the depth of sections listed in the table of contents from
+two to three:</p><pre class="programlisting">&lt;?xml version='1.0'?&gt;
+&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default"&gt;
+
+&lt;xsl:import href="docbook.xsl"/&gt;
+
+&lt;xsl:variable name="toc.section.depth"&gt;3&lt;/xsl:variable&gt;
+&lt;!-- Add other variable definitions here --&gt;
+
+&lt;/xsl:stylesheet&gt;
+</pre><p>Following the opening stylesheet element are the
+import instruction and one variable definition. The
+variable <tt>toc.section.depth</tt> was defined
+in <tt>param.xsl</tt> with value "2", and here
+it is defined as "3". Since the importing stylesheet takes
+precedence, this new value is used. Thus documents
+processed with <tt>mystyle.xsl</tt> instead
+of <tt>docbook.xsl</tt> will have three levels
+of sections in the tables of contents, and all other
+processing will be the same.</p><p>Use the list of variables
+in <tt>param.xsl</tt> as your guide for creating
+a custom stylesheet. If the changes you want are controlled
+by a variable there, then customizing is easy. </p></div><div class="sect2"><a name="c44b1b3b7c10"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7c10"></a>Writing your own templates</h3></div></div><p>If the changes you want are more extensive than what
+is supported by variables, you can write new templates. You
+can put your new templates directly in your importing
+stylesheet, or you can modularize your importing stylesheet
+as well. You can write your own stylesheet module
+containing a collection of templates for processing lists,
+for example, and put them in a file
+named <tt>mylists.xsl</tt>. Then your importing
+stylesheet can pull in your list templates with
+a <tt>&lt;xsl:include
+href="mylists.xsl"/&gt;</tt> instruction. Since your
+included template definitions appear after the main import
+instruction, your templates will take precedence.</p><p>You'll need to make sure your new templates are
+compatible with the remaining modules, which means:</p><div class="itemizedlist"><ul><li><p><a name="c44b1b3b7c10b4b1"></a>Any named templates should use the same name so
+calling templates in other modules can find them.</p></li><li><p><a name="c44b1b3b7c10b4b2"></a>Your template set should process the same elements
+matched by templates in the original module, to ensure
+complete coverage.</p></li><li><p><a name="c44b1b3b7c10b4b3"></a>Include the same set
+of <tt>&lt;xsl:param&gt;</tt> elements in each
+template to interface properly with any calling templates,
+although you can set different values for your
+parameters.</p></li><li><p><a name="c44b1b3b7c10b4b4"></a>Any templates that are used like subroutines to
+return a value should return the same data type.</p></li></ul></div></div><div class="sect2"><a name="c44b1b3b7c11"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7c11"></a>Writing your own driver</h3></div></div><p>Another approach to customizing the stylesheets is to
+write your own driver file. Instead of
+using <tt>&lt;xsl:import
+href="docbook.xsl"/&gt;</tt>, you copy that file to a
+new name and rewrite any of
+the <tt>&lt;xsl:include/&gt;</tt> instructions to
+assemble a custom collection of stylesheet modules. One
+reason to do this is to speed up processing by reducing the
+size of the stylesheet. If you are using a customized
+DocBook DTD that omits many elements you never use, you
+might be able to omit those modules of the
+stylesheet.</p></div><div class="sect2"><a name="c44b1b3b7c12"></a><div class="titlepage"><div><h3 class="title"><a name="c44b1b3b7c12"></a>Localization</h3></div></div><p>The DocBook stylesheets include features for
+localizing generated text, that is, printing any generated
+text in a language other than the default English. In
+general, the stylesheets will switch to the language
+identified by a <tt>lang</tt> attribute when
+processing elements in your documents. If your documents
+use the <tt>lang</tt> attribute, then you don't
+need to customize the stylesheets at all for
+localization.</p><p>As far as the stylesheets go,
+a <tt>lang</tt> attribute is inherited by the
+descendents of a document element. The stylesheet searches
+for a <tt>lang</tt> attribute using this XPath
+expression:</p><pre class="programlisting">&lt;xsl:variable name="lang-attr"
+ select="($target/ancestor-or-self::*/@lang
+ |$target/ancestor-or-self::*/@xml:lang)[last()]"/&gt;</pre><p>This locates the attribute on the current element or
+its most recent ancestor. Thus
+a <tt>lang</tt> attribute is in effect for an
+element and all of its descendents, unless it is reset in
+one of those descendents. If you define it in only your
+document root element, then it applies to the whole
+document:</p><pre class="programlisting">&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN" "docbook.dtd"&gt;
+&lt;book lang="fr"&gt;
+...
+&lt;/book&gt;</pre><p>When text is being generated, the stylesheet checks
+the most recent <tt>lang</tt> attribute and looks
+up the generated text strings for that language in a
+localization XML file. These are located in
+the <tt>common</tt> directory of the
+stylesheets, one file per language. Here is the top of the
+file <tt>fr.xml</tt>:</p><pre class="programlisting">&lt;localization language="fr"&gt;
+
+&lt;gentext key="abstract" text="R&amp;#x00E9;sum&amp;#x00E9;"/&gt;
+&lt;gentext key="answer" text="R:"/&gt;
+&lt;gentext key="appendix" text="Annexe"/&gt;
+&lt;gentext key="article" text="Article"/&gt;
+&lt;gentext key="bibliography" text="Bibliographie"/&gt;
+...
+</pre><p>The stylesheet templates use the gentext key names,
+and then the stylesheet looks up the associated text value
+when the document is processed with that lang setting. The
+file <tt>l10n.xml</tt> (note
+the <tt>.xml</tt> suffix) lists the filenames of
+all the supported languages.</p><p>You can also create a custom stylesheet that sets the
+language. That might be useful if your documents don't make
+appropriate use of the <tt>lang</tt> attribute.
+The module <tt>l10n.xsl</tt> defines two global
+variables that can be overridden with an importing
+stylesheet as described above. Here are their default
+definitions:</p><pre class="programlisting">&lt;xsl:variable name="l10n.gentext.language"&gt;&lt;/xsl:variable&gt;
+&lt;xsl:variable name="l10n.gentext.default.language"&gt;en&lt;/xsl:variable&gt;
+</pre><p>The first one sets the language for all elements,
+regardless of an element's <tt>lang</tt> attribute
+value. The second just sets a default language for any
+elements that haven't got a <tt>lang</tt> setting
+of their own (or their ancestors).</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="ch01s03.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="extensions.html">Next</a></td></tr><tr><td width="40%" align="left">XSL processing model&nbsp;</td><td width="20%" align="center"><a href="publishing.html">Up</a></td><td width="40%" align="right">&nbsp;Chapter 2. Saxon Extensions</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/ch02s02.html b/tests/docbook/doc/ch02s02.html
new file mode 100644
index 00000000..703160ff
--- /dev/null
+++ b/tests/docbook/doc/ch02s02.html
@@ -0,0 +1,7 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Using the Extensions</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="extensions.html" title="Chapter 2. Saxon Extensions"><link rel="previous" href="extensions.html" title="Chapter 2. Saxon Extensions"><link rel="next" href="ch03.html" title="Chapter 3. Reference 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">Using the Extensions</th></tr><tr><td width="20%" align="left"><a href="extensions.html">Prev</a>&nbsp;</td><th width="60%" align="center">Chapter 2. Saxon Extensions</th><td width="20%" align="right">&nbsp;<a href="ch03.html">Next</a></td></tr></table><hr></div><p>For compatibility with other processors, the extensions are disabled
+by default. To enable the extensions, turn on
+<tt>$saxon.extensions</tt>, for example by passing
+<tt>saxon.extensions=1</tt> to Saxon.</p><p>For more control over the specific extensions, see
+<i><a href="html/param.html">HTML Parameter Reference</a></i>.</p><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="extensions.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch03.html">Next</a></td></tr><tr><td width="40%" align="left">Chapter 2. Saxon Extensions&nbsp;</td><td width="20%" align="center"><a href="extensions.html">Up</a></td><td width="40%" align="right">&nbsp;Chapter 3. Reference Documentation</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/ch03.html b/tests/docbook/doc/ch03.html
new file mode 100644
index 00000000..32ac631d
--- /dev/null
+++ b/tests/docbook/doc/ch03.html
@@ -0,0 +1,3 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Chapter 3. Reference Documentation</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="previous" href="ch02s02.html" title="Using the Extensions"><link rel="next" href="ch04.html" title="Chapter 4. The Template System"></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">Chapter 3. Reference Documentation</th></tr><tr><td width="20%" align="left"><a href="ch02s02.html">Prev</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a href="ch04.html">Next</a></td></tr></table><hr></div><p>Reference documentation is also available:</p><div class="itemizedlist"><ul><li><p><a name="c44b1b5b3b1"></a><i><a href="reference.html">DocBook XSL Stylesheet Reference Documentation</a></i></p></li></ul></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="ch02s02.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch04.html">Next</a></td></tr><tr><td width="40%" align="left">Using the Extensions&nbsp;</td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right">&nbsp;Chapter 4. The Template System</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/ch04.html b/tests/docbook/doc/ch04.html
new file mode 100644
index 00000000..21f0b0f1
--- /dev/null
+++ b/tests/docbook/doc/ch04.html
@@ -0,0 +1,58 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Chapter 4. The Template System</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="previous" href="ch03.html" title="Chapter 3. Reference 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">Chapter 4. The Template System</th></tr><tr><td width="20%" align="left"><a href="ch03.html">Prev</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;</td></tr></table><hr></div><p>Some parts of the DocBook XSL Stylesheets are actually generated
+using XSL Stylesheets. In particular, the formatting of title pages
+is generated using a special template system. The same template system
+will eventually allow you to easily customize bibliography entries and
+perhaps other parts of the system as well.</p><p>FIXME: there needs to be more introductory/explanatory text
+here!</p><p>In order to demonstrate how this system works, let's consider
+how we can use it to change the format of article title pages.</p><p>By default, the stylesheets print the following elements on the
+article title page, in this order: <span class="simplelist"><tt>title</tt>, <tt>subtitle</tt>, <tt>corpauthor</tt>, <tt>authorgroup</tt>, <tt>author</tt>, <tt>releaseinfo</tt>, <tt>copyright</tt>, <tt>legalnotice</tt>, <tt>pubdate</tt>, <tt>revision</tt>, <tt>revhistory</tt>, <tt>abstract</tt></span>. Suppose we want to put only the
+<tt>title</tt>, <tt>author</tt>, and
+<tt>edition</tt> elements on the title page, in the order
+that they appear in the <tt>articleinfo</tt>.
+</p><p>The &#8220;hard&#8221; (and wrong!) way to do it would be to
+edit <tt>titlepage.templates.xsl</tt> and make the changes
+by hand.</p><p>The easy and right way is to construct a template document that
+describes the order and sequence of elements that you want:</p><pre class="screen">
+&lt;t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ base-stylesheet="/path/to/html/docbook.xsl"&gt;
+
+&lt;t:titlepage element="article" wrapper="div" class="titlepage"&gt;
+ &lt;t:titlepage-content side="recto" order="document"&gt;
+ &lt;title predicate="[1]"/&gt;
+ &lt;author/&gt;
+ &lt;edition/&gt;
+ &lt;/t:titlepage-content&gt;
+&lt;/t:titlepage&gt;
+&lt;/t:templates&gt;
+</pre><p>Then process this document with the
+<tt>template/titlepage.xsl</tt> stylesheet. This will
+produce the following somewhat cryptic stylesheet:</p><pre class="screen">
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"&gt;
+
+&lt;!-- This stylesheet was created by titlepage.xsl; do not edit it by hand. --&gt;
+
+&lt;xsl:import href="/path/to/html/docbook.xsl"/&gt;
+
+&lt;xsl:template name="article.titlepage.recto"&gt;&lt;xsl:apply-templates mode="article.titlepage.recto.mode" select="(articleinfo/title|artheader/title|title)[1]|articleinfo/author|artheader/author|articleinfo/edition|artheader/edition"/&gt;
+&lt;/xsl:template&gt;
+
+&lt;xsl:template name="article.titlepage"&gt;
+ &lt;div class="titlepage"&gt;
+ &lt;xsl:call-template name="article.titlepage.before.recto"/&gt;
+ &lt;xsl:call-template name="article.titlepage.recto"/&gt;
+ &lt;xsl:call-template name="article.titlepage.before.verso"/&gt;
+ &lt;xsl:call-template name="article.titlepage.verso"/&gt;
+ &lt;xsl:call-template name="article.titlepage.separator"/&gt;
+ &lt;/div&gt;
+&lt;/xsl:template&gt;
+
+&lt;/xsl:stylesheet&gt;
+</pre><p>Despite its cryptic appearance, it has the desired result.
+If you want to change <i>how</i> the titlepage elements
+are formatted (as opposed to which ones are formatted), you have to
+write your own customization layer that overrides the template for
+the element in question in the &#8220;titlepage.mode&#8221; mode.</p><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="ch03.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;</td></tr><tr><td width="40%" align="left">Chapter 3. Reference Documentation&nbsp;</td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right">&nbsp;</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/common/ChangeLog b/tests/docbook/doc/common/ChangeLog
new file mode 100644
index 00000000..fd19ff47
--- /dev/null
+++ b/tests/docbook/doc/common/ChangeLog
@@ -0,0 +1,4 @@
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile: New file.
+
diff --git a/tests/docbook/doc/common/common.html b/tests/docbook/doc/common/common.html
new file mode 100644
index 00000000..b00ededf
--- /dev/null
+++ b/tests/docbook/doc/common/common.html
@@ -0,0 +1,379 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>Common Template Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.38">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>Common Template Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: all"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#template.is.component">is.component</a></dt>
+ <dt><a href="#template.is.section">is.section</a></dt>
+ <dt><a href="#template.section.level">section.level</a></dt>
+ <dt><a href="#template.qanda.section.level">qanda.section.level</a></dt>
+ <dt><a href="#template.select.mediaobject">select.mediaobject</a></dt>
+ <dt><a href="#template.is.acceptable.mediaobject">is.acceptable.mediaobject</a></dt>
+ <dt><a href="#template.check.id.unique">check.id.unique</a></dt>
+ <dt><a href="#template.check.idref.targets">check.idref.targets</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.is.component"></a>is.component
+ </h1>
+ <div class="refnamediv"><a name="d41e40"></a><h2>Name</h2>is.component &#8212; Tests if a given node is a component-level element
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e45"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="is.component"&gt;
+&lt;xsl:param name="node" select="."/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e48"></a>
+
+
+ <p>This template returns '1' if the specified node is a component
+ (Chapter, Appendix, etc.), and '0' otherwise.
+ </p>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e53"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e56"></a><span class="term">node</span></dt>
+ <dd>
+ <p><a name="d41e59"></a>The node which is to be tested.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e63"></a>Returns</b>
+
+
+ <p>This template returns '1' if the specified node is a component
+ (Chapter, Appendix, etc.), and '0' otherwise.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.is.section"></a>is.section
+ </h1>
+ <div class="refnamediv"><a name="d41e69"></a><h2>Name</h2>is.section &#8212; Tests if a given node is a section-level element
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e74"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="is.section"&gt;
+&lt;xsl:param name="node" select="."/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e77"></a>
+
+
+ <p>This template returns '1' if the specified node is a section
+ (Section, Sect1, Sect2, etc.), and '0' otherwise.
+ </p>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e82"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e85"></a><span class="term">node</span></dt>
+ <dd>
+ <p><a name="d41e88"></a>The node which is to be tested.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e92"></a>Returns</b>
+
+
+ <p>This template returns '1' if the specified node is a section
+ (Section, Sect1, Sect2, etc.), and '0' otherwise.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.section.level"></a>section.level
+ </h1>
+ <div class="refnamediv"><a name="d41e98"></a><h2>Name</h2>section.level &#8212; Returns the hierarchical level of a section.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e103"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="section.level"&gt;
+&lt;xsl:param name="node" select="."/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e106"></a>
+
+
+ <p>This template calculates the hierarchical level of a section.
+ Hierarchically, components are &#8220;top level&#8221;, so a
+ <tt>sect1</tt> is at level 2, <tt>sect3</tt> is
+ at level 3, etc.
+ </p>
+
+
+
+
+ <p>Recursive sections are calculated down to the sixth level.</p>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e123"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e126"></a><span class="term">node</span></dt>
+ <dd>
+ <p><a name="d41e129"></a>The section node for which the level should be calculated.
+ Defaults to the context node.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e133"></a>Returns</b>
+
+
+ <p>The section level, &#8220;2&#8221;, &#8220;3&#8221;, etc.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.qanda.section.level"></a>qanda.section.level
+ </h1>
+ <div class="refnamediv"><a name="d41e145"></a><h2>Name</h2>qanda.section.level &#8212; Returns the hierarchical level of a QandASet.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e150"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="qanda.section.level"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e153"></a>
+
+
+ <p>This template calculates the hierarchical level of a QandASet.
+
+ </p>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e158"></a>Returns</b>
+
+
+ <p>The level, &#8220;1&#8221;, &#8220;2&#8221;, etc.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.select.mediaobject"></a>select.mediaobject
+ </h1>
+ <div class="refnamediv"><a name="d41e170"></a><h2>Name</h2>select.mediaobject &#8212; Selects an appropriate media object from a list
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e175"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="select.mediaobject"&gt;
+&lt;xsl:param name="olist" select="imageobject|imageobjectco |videoobject|audioobject|textobject"/&gt;
+&lt;xsl:param name="count"&gt;1&lt;/xsl:param&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e178"></a>
+
+
+ <p>This template examines a list of media objects (usually the
+ children of a mediaobject or inlinemediaobject) and processes
+ the "right" object.
+ </p>
+
+
+
+
+ <p>This template relies on a template named "is.acceptable.mediaobject"
+ to determine if a given object is an acceptable graphic. The semantics
+ of media objects is that the first acceptable graphic should be used.
+
+ </p>
+
+
+
+
+ <p>If no acceptable object is located, nothing happens.</p>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e189"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e192"></a><span class="term">olist</span></dt>
+ <dd>
+ <p><a name="d41e195"></a>The node list of potential objects to examine.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e199"></a>Returns</b>
+
+
+ <p>Calls &lt;xsl:apply-templates&gt; on the selected object.</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.is.acceptable.mediaobject"></a>is.acceptable.mediaobject
+ </h1>
+ <div class="refnamediv"><a name="d41e205"></a><h2>Name</h2>is.acceptable.mediaobject &#8212; Returns '1' if the specified media object is recognized.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e210"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="is.acceptable.mediaobject"&gt;
+&lt;xsl:param name="object"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e213"></a>
+
+
+ <p>This template examines a media object and returns '1' if the
+ object is recognized as a graphic.
+ </p>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e218"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e221"></a><span class="term">object</span></dt>
+ <dd>
+ <p><a name="d41e224"></a>The media object to consider.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e228"></a>Returns</b>
+
+
+ <p>0 or 1</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.check.id.unique"></a>check.id.unique
+ </h1>
+ <div class="refnamediv"><a name="d41e234"></a><h2>Name</h2>check.id.unique &#8212; Warn users about references to non-unique IDs
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e239"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="check.id.unique"&gt;
+&lt;xsl:param name="linkend"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e242"></a>
+
+
+ <p>If passed an ID in <tt>linkend</tt>,
+ <tt>check.id.unique</tt> prints
+ a warning message to the user if either the ID does not exist or
+ the ID is not unique.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.check.idref.targets"></a>check.idref.targets
+ </h1>
+ <div class="refnamediv"><a name="d41e254"></a><h2>Name</h2>check.idref.targets &#8212; Warn users about incorrectly typed references
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e259"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="check.idref.targets"&gt;
+&lt;xsl:param name="linkend"/&gt;
+&lt;xsl:param name="element-list"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e262"></a>
+
+
+ <p>If passed an ID in <tt>linkend</tt>,
+ <tt>check.idref.targets</tt> makes sure that the element
+ pointed to by the link is one of the elements listed in
+ <tt>element-list</tt> and warns the user otherwise.
+ </p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/copyright.html b/tests/docbook/doc/copyright.html
new file mode 100644
index 00000000..27ae093b
--- /dev/null
+++ b/tests/docbook/doc/copyright.html
@@ -0,0 +1,19 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Copyright</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="legalnotice"><p class="legalnotice-title"><b>Copyright</b></p><p>Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the &#8220;Software&#8221;), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+</p><p>The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.</p><p>Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from the individuals
+in question.</p><p>Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the version
+strings in any derived Software will be changed so that no possibility
+of confusion between the derived package and this Software will
+exist.</p></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/extensions.html b/tests/docbook/doc/extensions.html
new file mode 100644
index 00000000..95c3aca6
--- /dev/null
+++ b/tests/docbook/doc/extensions.html
@@ -0,0 +1,41 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Chapter 2. Saxon Extensions</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="previous" href="ch01s04.html" title="Customizing DocBook XSL stylesheets"><link rel="next" href="ch02s02.html" title="Using the Extensions"></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">Chapter 2. Saxon Extensions</th></tr><tr><td width="20%" align="left"><a href="ch01s04.html">Prev</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a href="ch02s02.html">Next</a></td></tr></table><hr></div><p>Beginning with release 1.25, the DocBook XSL Stylesheets include
+a set of Java extensions for Saxon.</p><p>These extensions enable callouts, numbered program listings, and
+the direct inclusion of text:</p><div class="programlistingco"><pre class="programlisting">@rem = '--*-Perl-*--
+@echo off
+perl.exe %_batchname %$
+goto endofperl
+@rem ';
+
+# Compress mail...
+
+require 'n:/home/nwalsh/lib/cygnus.pl';
+require 'timelocal.pl';
+use Cwd;
+
+select (STDERR); $| = 1;
+select (STDOUT); $| = 1;
+
+@DIRS = ("/home/nwalsh/Mail");
+while (@DIRS) {
+ $dir = shift @DIRS;
+ opendir (DIR, $dir);
+ while ($fname = readdir(DIR)) {
+ $file = "$dir/$fname";
+ next if ! -d $file;
+ next if $fname =~ /^\.\.?$/;
+
+ print "$file\n";
+ push (@DIRS, $file);
+ &amp;compress ($file);
+ }
+}
+
+exit;</pre><div class="calloutlist"><a name="c44b1b4b5b3"></a><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="c44b1b4b5b3b1"></a><img src="../images/callouts/1.png" alt="1" border="0"></td><td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="c44b1b4b5b3b2"></a><img src="../images/callouts/2.png" alt="2" border="0"></td><td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
+file interpreter, skips over the body of the Perl script.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="c44b1b4b5b3b3"></a><img src="../images/callouts/3.png" alt="3" border="0"></td><td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
+fragments.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="c44b1b4b5b3b4"></a><img src="../images/callouts/4.png" alt="4" border="0"></td><td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
+utility. It is a Perl5 function. (Note that this callout area specifies
+both a line and a column.)</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="c44b1b4b5b3b5"></a><img src="../images/callouts/5.png" alt="5" border="0"></td><td valign="top" align="left"><p>This is a user subroutine call.</p></td></tr></table></div></div><p>The extensions are included in the distribution in
+<tt>extensions/nwalsh.jar</tt>. Just make sure that jar
+file is in your CLASSPATH when you run Saxon.</p><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="ch01s04.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch02s02.html">Next</a></td></tr><tr><td width="40%" align="left">Customizing DocBook XSL stylesheets&nbsp;</td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right">&nbsp;Using the Extensions</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/fo/ChangeLog b/tests/docbook/doc/fo/ChangeLog
new file mode 100644
index 00000000..fd19ff47
--- /dev/null
+++ b/tests/docbook/doc/fo/ChangeLog
@@ -0,0 +1,4 @@
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile: New file.
+
diff --git a/tests/docbook/doc/fo/param.html b/tests/docbook/doc/fo/param.html
new file mode 100644
index 00000000..e71a5c96
--- /dev/null
+++ b/tests/docbook/doc/fo/param.html
@@ -0,0 +1,1616 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>Formatting Object Parameter Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.39">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>Formatting Object Parameter Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: both"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This reference describes each of the Formatting Object
+ Stylesheet parameters. These are the &#8220;easily
+ customizable&#8221; parts of the stylesheet. If you want to specify
+ an alternate value for one or more of these parameters, you can do so
+ in a &#8220;driver&#8221; stylesheet.
+ </p>
+ <p>For example, if you want to turn on automatic section numbering,
+ you might create a driver stylesheet like this:
+ </p><pre class="programlisting">&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'&gt;
+
+ &lt;xsl:import href="/path/to/fo/docbook.xsl"/&gt;
+
+ &lt;xsl:param name="section.autolabel" select="1"/&gt;
+
+&lt;/xsl:stylesheet&gt;</pre><p>Naturally, you have to change the
+ <tt>href</tt> attribute on
+ <tt>&lt;xsl:import&gt;</tt>
+ to point to <tt>docbook.xsl</tt>
+ on your system.
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#param.admon.graphics.extension">admon.graphics.extension</a></dt>
+ <dt><a href="#var.qandadiv.autolabel">qandadiv.autolabel</a></dt>
+ <dt><a href="#var.qanda.inherit.numeration">qanda.inherit.numeration</a></dt>
+ <dt><a href="#var.graphic.default.extension">graphic.default.extension</a></dt>
+ <dt><a href="#attrset.formal.title.properties">formal.title.properties mode</a></dt>
+ <dt><a href="#attrset.component.title.properties">component.title.properties mode</a></dt>
+ <dt><a href="#attrset.admonition.title.properties">admonition.title.properties mode</a></dt>
+ <dt><a href="#attrset.xref.properties">xref.properties mode</a></dt>
+ <dt><a href="#param.insert.xref.page.number">insert.xref.page.number</a></dt>
+ <dt><a href="#attrset.normal.para.spacing">normal.para.spacing mode</a></dt>
+ <dt><a href="#attrset.list.block.spacing">list.block.spacing mode</a></dt>
+ <dt><a href="#attrset.list.item.spacing">list.item.spacing mode</a></dt>
+ <dt><a href="#param.rootid">rootid</a></dt>
+ <dt><a href="#param.callout.graphics">callout.graphics</a></dt>
+ <dt><a href="#param.callout.unicode">callout.unicode</a></dt>
+ <dt><a href="#param.callout.dingbats">callout.dingbats</a></dt>
+ <dt><a href="#param.callout.unicode.start.character">callout.unicode.start.character</a></dt>
+ <dt><a href="#param.callout.unicode.number.limit">callout.unicode.number.limit</a></dt>
+ <dt><a href="#param.callout.graphics.extension">callout.graphics.extension</a></dt>
+ <dt><a href="#param.callout.graphics.path">callout.graphics.path</a></dt>
+ <dt><a href="#param.callout.graphics.number.limit">callout.graphics.number.limit</a></dt>
+ <dt><a href="#param.use.extensions">use.extensions</a></dt>
+ <dt><a href="#param.textinsert.extension">textinsert.extension</a></dt>
+ <dt><a href="#param.linenumbering.extension">linenumbering.extension</a></dt>
+ <dt><a href="#param.linenumbering.everyNth">linenumbering.everyNth</a></dt>
+ <dt><a href="#param.linenumbering.width">linenumbering.width</a></dt>
+ <dt><a href="#param.linenumbering.separator">linenumbering.separator</a></dt>
+ <dt><a href="#param.callouts.extension">callouts.extension</a></dt>
+ <dt><a href="#param.callout.defaultcolumn">callout.defaultcolumn</a></dt>
+ <dt><a href="#param.tablecolumns.extension">tablecolumns.extension</a></dt>
+ <dt><a href="#param.nominal.table.width">nominal.table.width</a></dt>
+ <dt><a href="#param.default.table.width">default.table.width</a></dt>
+ <dt><a href="#param.paper.type">paper.type</a></dt>
+ <dt><a href="#param.page.orientation">page.orientation</a></dt>
+ <dt><a href="#param.page.width.portrait">page.width.portrait</a></dt>
+ <dt><a href="#param.page.height.portrait">page.height.portrait</a></dt>
+ <dt><a href="#param.page.width">page.width</a></dt>
+ <dt><a href="#param.page.height">page.height</a></dt>
+ <dt><a href="#param.double.sided">double.sided</a></dt>
+ <dt><a href="#param.column.count">column.count</a></dt>
+ <dt><a href="#param.region.after.extent">region.after.extent</a></dt>
+ <dt><a href="#param.region.before.extent">region.before.extent</a></dt>
+ <dt><a href="#param.page.margin.top">page.margin.top</a></dt>
+ <dt><a href="#param.page.margin.bottom">page.margin.bottom</a></dt>
+ <dt><a href="#param.page.margin.inner">page.margin.inner</a></dt>
+ <dt><a href="#param.page.margin.outer">page.margin.outer</a></dt>
+ <dt><a href="#param.body.margin.bottom">body.margin.bottom</a></dt>
+ <dt><a href="#param.body.margin.top">body.margin.top</a></dt>
+ <dt><a href="#param.body.font.family">body.font.family</a></dt>
+ <dt><a href="#param.title.font.family">title.font.family</a></dt>
+ <dt><a href="#param.monospace.font.family">monospace.font.family</a></dt>
+ <dt><a href="#param.sans.font.family">sans.font.family</a></dt>
+ <dt><a href="#param.body.font.master">body.font.master</a></dt>
+ <dt><a href="#param.body.font.size">body.font.size</a></dt>
+ <dt><a href="#param.footnote.font.size">footnote.font.size</a></dt>
+ <dt><a href="#param.hyphenate">hyphenate</a></dt>
+ <dt><a href="#param.alignment">alignment</a></dt>
+ <dt><a href="#param.stylesheet.result.type">stylesheet.result.type</a></dt>
+ <dt><a href="#param.generate.component.toc">generate.component.toc</a></dt>
+ <dt><a href="#param.generate.division.toc">generate.division.toc</a></dt>
+ <dt><a href="#param.generate.division.figure.lot">generate.division.figure.lot</a></dt>
+ <dt><a href="#param.generate.division.example.lot">generate.division.example.lot</a></dt>
+ <dt><a href="#param.generate.division.equation.lot">generate.division.equation.lot</a></dt>
+ <dt><a href="#param.generate.division.table.lot">generate.division.table.lot</a></dt>
+ <dt><a href="#param.passivetex.extensions">passivetex.extensions</a></dt>
+ <dt><a href="#param.arbortext.extensions">arbortext.extensions</a></dt>
+ <dt><a href="#param.fop.extensions">fop.extensions</a></dt>
+ <dt><a href="#param.default.units">default.units</a></dt>
+ <dt><a href="#param.label.from.part">label.from.part</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.admon.graphics.extension"></a>admon.graphics.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e63"></a><h2>Name</h2>admon.graphics.extension &#8212; Extension for admonition graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e68"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="admon.graphics.extension" select="'.png'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e71"></a>
+
+
+ <p>Sets the extension to use on admonition graphics.</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="var.qandadiv.autolabel"></a>qandadiv.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e77"></a><h2>Name</h2>qandadiv.autolabel &#8212; Are divisions in QAndASets enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e82"></a><h2>Synopsis</h2><pre class="synopsis"></pre></div>
+ <div class="refdescription"><a name="d41e84"></a>
+
+
+ <p>If true (non-zero), unlabeled qandadivs will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="var.qanda.inherit.numeration"></a>qanda.inherit.numeration
+ </h1>
+ <div class="refnamediv"><a name="d41e90"></a><h2>Name</h2>qanda.inherit.numeration &#8212; Does enumeration of QandASet components inherit the numeration of parent elements?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e95"></a><h2>Synopsis</h2><pre class="synopsis"></pre></div>
+ <div class="refdescription"><a name="d41e97"></a>
+
+
+ <p>If true (non-zero), numbered QandADiv elements and Questions and Answers inherit
+ the numeration of the ancestors of the QandASet.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="var.graphic.default.extension"></a>graphic.default.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e103"></a><h2>Name</h2>graphic.default.extension &#8212; Default extension for graphic filenames
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e108"></a><h2>Synopsis</h2><pre class="synopsis"></pre></div>
+ <div class="refdescription"><a name="d41e110"></a>
+
+
+ <p>If a <tt>graphic</tt> or <tt>mediaobject</tt>
+ includes a reference to a filename that does not include an extension,
+ and the <tt>format</tt> attribute is
+ <i>unspecified</i>, the default extension will be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.formal.title.properties"></a>formal.title.properties mode
+ </h1>
+ <div class="refnamediv"><a name="d41e128"></a><h2>Name</h2>formal.title.properties mode &#8212; Properties of formal object titles
+ </div>
+ <div class="refdescription"><a name="d41e133"></a>
+
+
+ <p>This attribute set is used to specify the properties of formal
+ object titles.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.component.title.properties"></a>component.title.properties mode
+ </h1>
+ <div class="refnamediv"><a name="d41e139"></a><h2>Name</h2>component.title.properties mode &#8212; Properties of component titles
+ </div>
+ <div class="refdescription"><a name="d41e144"></a>
+
+
+ <p>This attribute set is used to specify the properties of component
+ titles.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.admonition.title.properties"></a>admonition.title.properties mode
+ </h1>
+ <div class="refnamediv"><a name="d41e150"></a><h2>Name</h2>admonition.title.properties mode &#8212; Properties of admonition titles
+ </div>
+ <div class="refdescription"><a name="d41e155"></a>
+
+
+ <p>This attribute set is used to specify the properties of admonition
+ titles.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.xref.properties"></a>xref.properties mode
+ </h1>
+ <div class="refnamediv"><a name="d41e161"></a><h2>Name</h2>xref.properties mode &#8212; Visual properties of hotlinks
+ </div>
+ <div class="refdescription"><a name="d41e166"></a>
+
+
+ <p>This attribute set is used to specify properties of xrefs
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.insert.xref.page.number"></a>insert.xref.page.number
+ </h1>
+ <div class="refnamediv"><a name="d41e172"></a><h2>Name</h2>insert.xref.page.number &#8212; Turns page numbers in xrefs on and off
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e177"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="insert.xref.page.number" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e180"></a>
+
+
+ <p>When equal to 1, this parameter triggers generation of page
+ number citations after xrefs.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.normal.para.spacing"></a>normal.para.spacing mode
+ </h1>
+ <div class="refnamediv"><a name="d41e186"></a><h2>Name</h2>normal.para.spacing mode &#8212; Spacing properties of normal paragraphs
+ </div>
+ <div class="refdescription"><a name="d41e191"></a>
+
+
+ <p>This attribute set is used to specify the spacing properties
+ of normal paragraphs.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.list.block.spacing"></a>list.block.spacing mode
+ </h1>
+ <div class="refnamediv"><a name="d41e197"></a><h2>Name</h2>list.block.spacing mode &#8212; Spacing properties of list blocks
+ </div>
+ <div class="refdescription"><a name="d41e202"></a>
+
+
+ <p>This attribute set is used to specify the spacing properties
+ of list blocks.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.list.item.spacing"></a>list.item.spacing mode
+ </h1>
+ <div class="refnamediv"><a name="d41e208"></a><h2>Name</h2>list.item.spacing mode &#8212; Spacing properties of list items
+ </div>
+ <div class="refdescription"><a name="d41e213"></a>
+
+
+ <p>This attribute set is used to specify the spacing properties
+ of list items.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.rootid"></a>rootid
+ </h1>
+ <div class="refnamediv"><a name="d41e219"></a><h2>Name</h2>rootid &#8212; Specify the root element to format
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e224"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="rootid" select="''"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e227"></a>
+
+
+ <p>If <i><tt>rootid</tt></i> is specified, it must be the
+ value of an ID that occurs in the document being formatted. The entire
+ document will be loaded and parsed, but formatting will begin at the
+ element identified, rather than at the root. For example, this allows
+ you to process only chapter 4 of a book.
+ </p>
+
+
+
+ <p>Because the entire document is available to the processor, automatic
+ numbering, cross references, and other dependencies are correctly
+ resolved.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics"></a>callout.graphics
+ </h1>
+ <div class="refnamediv"><a name="d41e239"></a><h2>Name</h2>callout.graphics &#8212; Use graphics for callouts?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e244"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics" select="'0'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e247"></a>
+
+
+ <p>If non-zero, callouts are presented with graphics (e.g., reverse-video
+ circled numbers instead of "(1)", "(2)", etc.).
+ Default graphics are provided in the distribution.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode"></a>callout.unicode
+ </h1>
+ <div class="refnamediv"><a name="d41e253"></a><h2>Name</h2>callout.unicode &#8212; First character to use for Unicode callouts
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e258"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode" select="1"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e261"></a>
+
+
+ <p>If non-zero, callouts are presented with Unicode characters
+ starting with the character specified. Zero indicates that Unicode
+ callouts should not be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.dingbats"></a>callout.dingbats
+ </h1>
+ <div class="refnamediv"><a name="d41e267"></a><h2>Name</h2>callout.dingbats &#8212; Use Zapf Dingbats for callouts?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e272"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.dingbats" select="'0'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e275"></a>
+
+
+ <p>If non-zero, callouts are presented with Zapf Dingbats.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode.start.character"></a>callout.unicode.start.character
+ </h1>
+ <div class="refnamediv"><a name="d41e281"></a><h2>Name</h2>callout.unicode.start.character &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e286"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode.start.character" select="10102" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e289"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode.number.limit"></a>callout.unicode.number.limit
+ </h1>
+ <div class="refnamediv"><a name="d41e301"></a><h2>Name</h2>callout.unicode.number.limit &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e306"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode.number.limit" select="'10'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e309"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.extension"></a>callout.graphics.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e321"></a><h2>Name</h2>callout.graphics.extension &#8212; Extension for callout graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e326"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.extension" select="'.png'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e329"></a>
+
+
+ <p>Sets the extension to use on callout graphics.</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.path"></a>callout.graphics.path
+ </h1>
+ <div class="refnamediv"><a name="d41e335"></a><h2>Name</h2>callout.graphics.path &#8212; Path to callout graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e340"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.path" select="'../images/callouts/'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e343"></a>
+
+
+ <p>Sets the path, probably relative to the directory where the HTML
+ files are created, to the callout graphics.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.number.limit"></a>callout.graphics.number.limit
+ </h1>
+ <div class="refnamediv"><a name="d41e349"></a><h2>Name</h2>callout.graphics.number.limit &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e354"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.number.limit" select="'10'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e357"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.use.extensions"></a>use.extensions
+ </h1>
+ <div class="refnamediv"><a name="d41e369"></a><h2>Name</h2>use.extensions &#8212; Enable extensions
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e374"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="use.extensions" select="'0'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e377"></a>
+
+
+ <p>If non-zero, extensions may be used. Each extension is
+ further controlled by its own parameter. But if
+ <i><tt>use.extensions</tt></i> is zero, no extensions will
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.textinsert.extension"></a>textinsert.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e386"></a><h2>Name</h2>textinsert.extension &#8212; Enable the textinsert extension element
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e391"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="textinsert.extension" select="'1'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e394"></a>
+
+
+ <p>The textinsert extension element inserts the contents of a
+ a file into the result tree (as text).
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.extension"></a>linenumbering.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e400"></a><h2>Name</h2>linenumbering.extension &#8212; Enable the line numbering extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e405"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.extension" select="'1'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e408"></a>
+
+
+ <p>If true, verbatim environments (elements that have the
+ format='linespecific' notation attribute: address, literallayout,
+ programlisting, screen, synopsis) that specify line numbering will
+ have, surprise, line numbers.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.everyNth"></a>linenumbering.everyNth
+ </h1>
+ <div class="refnamediv"><a name="d41e414"></a><h2>Name</h2>linenumbering.everyNth &#8212; Indicate which lines should be numbered
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e419"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.everyNth" select="'5'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e422"></a>
+
+
+ <p>If line numbering is enabled, everyNth line will be numbered.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.width"></a>linenumbering.width
+ </h1>
+ <div class="refnamediv"><a name="d41e428"></a><h2>Name</h2>linenumbering.width &#8212; Indicates the width of line numbers
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e433"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.width" select="'3'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e436"></a>
+
+
+ <p>If line numbering is enabled, line numbers will appear right
+ justified in a field "width" characters wide.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.separator"></a>linenumbering.separator
+ </h1>
+ <div class="refnamediv"><a name="d41e442"></a><h2>Name</h2>linenumbering.separator &#8212; Specify a separator between line numbers and lines
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e447"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.separator" select="' '"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e450"></a>
+
+
+ <p>The separator is inserted between line numbers and lines in
+ the verbatim environment.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callouts.extension"></a>callouts.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e456"></a><h2>Name</h2>callouts.extension &#8212; Enable the callout extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e461"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callouts.extension" select="'1'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e464"></a>
+
+
+ <p>The callouts extension processes <tt>areaset</tt>
+ elements in <tt>ProgramListingCO</tt> and other text-based
+ callout elements.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.defaultcolumn"></a>callout.defaultcolumn
+ </h1>
+ <div class="refnamediv"><a name="d41e476"></a><h2>Name</h2>callout.defaultcolumn &#8212; Indicates what column callouts appear in by default
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e481"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.defaultcolumn" select="'60'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e484"></a>
+
+
+ <p>If a callout does not identify a column (for example, if it uses
+ the <tt>linerange</tt> <tt>unit</tt>),
+ it will appear in the default column.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.tablecolumns.extension"></a>tablecolumns.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e496"></a><h2>Name</h2>tablecolumns.extension &#8212; Enable the table columns extension function
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e501"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="tablecolumns.extension" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e504"></a>
+
+
+ <p>The table columns extension function adjusts the widths of table
+ columns in the HTML result to more accurately reflect the specifications
+ in the CALS table.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.nominal.table.width"></a>nominal.table.width
+ </h1>
+ <div class="refnamediv"><a name="d41e510"></a><h2>Name</h2>nominal.table.width &#8212; The (absolute) nominal width of tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e515"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="nominal.table.width" select="'6in'" doc:type="length"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e518"></a>
+
+
+ <p>In order to convert CALS column widths into FO column widths, it
+ is sometimes necessary to have an absolute table width to use for conversion
+ of mixed absolute and relative widths. This value must be an absolute
+ length (not a percentage).
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.default.table.width"></a>default.table.width
+ </h1>
+ <div class="refnamediv"><a name="d41e524"></a><h2>Name</h2>default.table.width &#8212; The default width of tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e529"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="default.table.width" select="''" doc:type="length"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e532"></a>
+
+
+ <p>If specified, this value will be used for the WIDTH attribute on
+ tables that do not specify an alternate width (with the dbhtml processing
+ instruction).
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.paper.type"></a>paper.type
+ </h1>
+ <div class="refnamediv"><a name="d41e538"></a><h2>Name</h2>paper.type &#8212; Select the paper type
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e543"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="paper.type" select="'USletter'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e546"></a>
+
+
+ <p>The paper type is a convenient way to specify the paper size.
+ The list of known paper sizes includes USletter and most of the A,
+ B, and C sizes. See <tt>page.width.portrait</tt>, for example.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.orientation"></a>page.orientation
+ </h1>
+ <div class="refnamediv"><a name="d41e555"></a><h2>Name</h2>page.orientation &#8212; Select the page orientation
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e560"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.orientation" select="'portrait'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e563"></a>
+
+
+ <p>In portrait orientation, the short edge is horizontal; in
+ landscape orientation, it is vertical.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.width.portrait"></a>page.width.portrait
+ </h1>
+ <div class="refnamediv"><a name="d41e569"></a><h2>Name</h2>page.width.portrait &#8212; Specify the physical size of the short edge of the page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e574"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.width.portrait"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$paper.type = 'USletter'"&gt;8.5in&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = '4A0'"&gt;1682mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = '2A0'"&gt;1189mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A0'"&gt;841mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A1'"&gt;594mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A2'"&gt;420mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A3'"&gt;297mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A4'"&gt;210mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A5'"&gt;148mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A6'"&gt;105mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A7'"&gt;74mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A8'"&gt;52mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A9'"&gt;37mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A10'"&gt;26mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B0'"&gt;1000mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B1'"&gt;707mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B2'"&gt;500mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B3'"&gt;353mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B4'"&gt;250mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B5'"&gt;176mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B6'"&gt;125mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B7'"&gt;88mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B8'"&gt;62mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B9'"&gt;44mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B10'"&gt;31mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C0'"&gt;917mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C1'"&gt;648mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C2'"&gt;458mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C3'"&gt;324mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C4'"&gt;229mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C5'"&gt;162mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C6'"&gt;114mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C7'"&gt;81mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C8'"&gt;57mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C9'"&gt;40mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C10'"&gt;28mm&lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;8.5in&lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e577"></a>
+
+
+ <p>The portrait page width is the length of the short
+ edge of the physical page.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.height.portrait"></a>page.height.portrait
+ </h1>
+ <div class="refnamediv"><a name="d41e583"></a><h2>Name</h2>page.height.portrait &#8212; Specify the physical size of the long edge of the page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e588"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.height.portrait"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$paper.type = 'A4landscape'"&gt;210mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'USletter'"&gt;11in&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'USlandscape'"&gt;8.5in&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = '4A0'"&gt;2378mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = '2A0'"&gt;1682mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A0'"&gt;1189mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A1'"&gt;841mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A2'"&gt;594mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A3'"&gt;420mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A4'"&gt;297mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A5'"&gt;210mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A6'"&gt;148mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A7'"&gt;105mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A8'"&gt;74mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A9'"&gt;52mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'A10'"&gt;37mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B0'"&gt;1414mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B1'"&gt;1000mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B2'"&gt;707mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B3'"&gt;500mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B4'"&gt;353mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B5'"&gt;250mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B6'"&gt;176mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B7'"&gt;125mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B8'"&gt;88mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B9'"&gt;62mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'B10'"&gt;44mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C0'"&gt;1297mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C1'"&gt;917mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C2'"&gt;648mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C3'"&gt;458mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C4'"&gt;324mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C5'"&gt;229mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C6'"&gt;162mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C7'"&gt;114mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C8'"&gt;81mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C9'"&gt;57mm&lt;/xsl:when&gt;
+ &lt;xsl:when test="$paper.type = 'C10'"&gt;40mm&lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;11in&lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e591"></a>
+
+
+ <p>The portrait page height is the length of the long
+ edge of the physical page.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.width"></a>page.width
+ </h1>
+ <div class="refnamediv"><a name="d41e597"></a><h2>Name</h2>page.width &#8212; The width of the physical page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e602"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.width"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$page.orientation = 'portrait'"&gt;
+ &lt;xsl:value-of select="$page.width.portrait"/&gt;
+ &lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;
+ &lt;xsl:value-of select="$page.height.portrait"/&gt;
+ &lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e605"></a>
+
+
+ <p>The page width is generally calculated from the
+ <tt>paper.type</tt> and
+ <tt>page.orientation</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.height"></a>page.height
+ </h1>
+ <div class="refnamediv"><a name="d41e617"></a><h2>Name</h2>page.height &#8212; The height of the physical page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e622"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.height"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$page.orientation = 'portrait'"&gt;
+ &lt;xsl:value-of select="$page.height.portrait"/&gt;
+ &lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;
+ &lt;xsl:value-of select="$page.width.portrait"/&gt;
+ &lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e625"></a>
+
+
+ <p>The page height is generally calculated from the
+ <tt>paper.type</tt> and
+ <tt>page.orientation</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.double.sided"></a>double.sided
+ </h1>
+ <div class="refnamediv"><a name="d41e637"></a><h2>Name</h2>double.sided &#8212; Is the document to be printed double sided?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e642"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="double.sided" select="'0'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e645"></a>
+
+
+ <p>Double-sided documents are printed with a slightly wider margin
+ on the binding edge of the page.
+
+ </p>
+
+
+
+ <p>FIXME: The current set of parameters does not take writing direction
+ into account.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.column.count"></a>column.count
+ </h1>
+ <div class="refnamediv"><a name="d41e654"></a><h2>Name</h2>column.count &#8212; Specifies the number of columns of text on the page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e659"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="column.count" select="'1'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e662"></a>
+
+
+ <p>The specified number of columns of text will appear on each page.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.region.after.extent"></a>region.after.extent
+ </h1>
+ <div class="refnamediv"><a name="d41e668"></a><h2>Name</h2>region.after.extent &#8212; Specifies the height of the footer.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e673"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="region.after.extent" select="'12pt'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e676"></a>
+
+
+ <p>The region after extent is the height of the area where footers
+ are printed.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.region.before.extent"></a>region.before.extent
+ </h1>
+ <div class="refnamediv"><a name="d41e682"></a><h2>Name</h2>region.before.extent &#8212; Specifies the height of the header
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e687"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="region.before.extent" select="'12pt'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e690"></a>
+
+
+ <p>The region before extent is the height of the area where headers
+ are printed.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.margin.top"></a>page.margin.top
+ </h1>
+ <div class="refnamediv"><a name="d41e696"></a><h2>Name</h2>page.margin.top &#8212; The top margin of the page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e701"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.margin.top"&gt;1in&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e704"></a>
+
+
+ <p>The top page margin is the distance from the physical top of the
+ page to the first line of text (body or header).
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.margin.bottom"></a>page.margin.bottom
+ </h1>
+ <div class="refnamediv"><a name="d41e710"></a><h2>Name</h2>page.margin.bottom &#8212; The bottom margin of the page
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e715"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.margin.bottom"&gt;1in&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e718"></a>
+
+
+ <p>The bottom page margin is the distance from the physical bottom of
+ the page to the last line of text (body or footer).
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.margin.inner"></a>page.margin.inner
+ </h1>
+ <div class="refnamediv"><a name="d41e724"></a><h2>Name</h2>page.margin.inner &#8212; The inner page margin
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e729"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.margin.inner"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$double.sided != 0"&gt;1.25in&lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;1in&lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e732"></a>
+
+
+ <p>The inner page margin is the distance from binding edge of the
+ page to the first column of text. In the left-to-right, top-to-bottom writing
+ direction, this is the left margin of recto pages.
+ </p>
+
+
+
+ <p>The inner and outer margins are usually the same unless the output
+ is double-sided.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.page.margin.outer"></a>page.margin.outer
+ </h1>
+ <div class="refnamediv"><a name="d41e741"></a><h2>Name</h2>page.margin.outer &#8212; The outer page margin
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e746"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="page.margin.outer"&gt;
+ &lt;xsl:choose&gt;
+ &lt;xsl:when test="$double.sided != 0"&gt;0.75in&lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;10pc&lt;/xsl:otherwise&gt;
+ &lt;/xsl:choose&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e749"></a>
+
+
+ <p>The outer page margin is the distance from non-binding edge of the
+ page to the last column of text. In the left-to-right, top-to-bottom writing
+ direction, this is the right margin of recto pages.
+ </p>
+
+
+
+ <p>The inner and outer margins are usually the same unless the output
+ is double-sided.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.body.margin.bottom"></a>body.margin.bottom
+ </h1>
+ <div class="refnamediv"><a name="d41e758"></a><h2>Name</h2>body.margin.bottom &#8212; The bottom margin of the body text
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e763"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="body.margin.bottom"&gt;24pt&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e766"></a>
+
+
+ <p>The body bottom margin is the distance from the last line of text
+ in the page body to the bottom page margin. Note that the page footer, if
+ any, appears in the space between the body bottom margin and the page
+ bottom margin.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.body.margin.top"></a>body.margin.top
+ </h1>
+ <div class="refnamediv"><a name="d41e772"></a><h2>Name</h2>body.margin.top &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e777"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="body.margin.top"&gt;24pt&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e780"></a>
+
+
+ <p>The body top margin is the distance from the page top margin to
+ the first line of text
+ in the page body. Note that the page header, if
+ any, appears in the space between the page top margin and the body
+ top margin.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.body.font.family"></a>body.font.family
+ </h1>
+ <div class="refnamediv"><a name="d41e786"></a><h2>Name</h2>body.font.family &#8212; The default font family for body text
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e791"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="body.font.family"&gt;Times Roman&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e794"></a>
+
+
+ <p>The body font family is the default font used for text in the page body.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.title.font.family"></a>title.font.family
+ </h1>
+ <div class="refnamediv"><a name="d41e800"></a><h2>Name</h2>title.font.family &#8212; The default font family for titles
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e805"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="title.font.family"&gt;Helvetica&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e808"></a>
+
+
+ <p>The title font family is used for titles (chapter, section, figure,
+ etc.)
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.monospace.font.family"></a>monospace.font.family
+ </h1>
+ <div class="refnamediv"><a name="d41e814"></a><h2>Name</h2>monospace.font.family &#8212; The default font family for monospace environments
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e819"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="monospace.font.family"&gt;Courier&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e822"></a>
+
+
+ <p>The monospace font family is used for verbatim environments
+ (program listings, screens, etc.).
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.sans.font.family"></a>sans.font.family
+ </h1>
+ <div class="refnamediv"><a name="d41e828"></a><h2>Name</h2>sans.font.family &#8212; The default sans-serif font family
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e833"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="sans.font.family"&gt;Helvetica&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e836"></a>
+
+
+ <p>The default sans-serif font family. At the present, this isn't
+ actually used by the stylesheets.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.body.font.master"></a>body.font.master
+ </h1>
+ <div class="refnamediv"><a name="d41e842"></a><h2>Name</h2>body.font.master &#8212; Specifies the default point size for body text
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e847"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="body.font.master"&gt;10&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e850"></a>
+
+
+ <p>The body font size is specified in two parameters
+ (<tt>body.font.master</tt> and <tt>body.font.size</tt>)
+ so that math can be performed on the font size by XSLT.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.body.font.size"></a>body.font.size
+ </h1>
+ <div class="refnamediv"><a name="d41e862"></a><h2>Name</h2>body.font.size &#8212; Specifies the default font size for body text
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e867"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="body.font.size"&gt;
+ &lt;xsl:value-of select="$body.font.master"/&gt;&lt;xsl:text&gt;pt&lt;/xsl:text&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e870"></a>
+
+
+ <p>The body font size is specified in two parameters
+ (<tt>body.font.master</tt> and <tt>body.font.size</tt>)
+ so that math can be performed on the font size by XSLT.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.footnote.font.size"></a>footnote.font.size
+ </h1>
+ <div class="refnamediv"><a name="d41e882"></a><h2>Name</h2>footnote.font.size &#8212; The font size for footnotes
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e887"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="footnote.font.size"&gt;
+ &lt;xsl:value-of select="$body.font.master * 0.8"/&gt;&lt;xsl:text&gt;pt&lt;/xsl:text&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e890"></a>
+
+
+ <p>The footnote font size is used for...footnotes!
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.hyphenate"></a>hyphenate
+ </h1>
+ <div class="refnamediv"><a name="d41e896"></a><h2>Name</h2>hyphenate &#8212; Specify hyphenation behavior
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e901"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="hyphenate"&gt;true&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e904"></a>
+
+
+ <p>If true, words may be hyphenated. Otherwise, they may not.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.alignment"></a>alignment
+ </h1>
+ <div class="refnamediv"><a name="d41e910"></a><h2>Name</h2>alignment &#8212; Specify the default text alignment
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e915"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="alignment"&gt;justify&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e918"></a>
+
+
+ <p>The default text alignment is used for most body text.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.stylesheet.result.type"></a>stylesheet.result.type
+ </h1>
+ <div class="refnamediv"><a name="d41e924"></a><h2>Name</h2>stylesheet.result.type &#8212; Identifies the output format of this stylesheet
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e929"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="stylesheet.result.type" select="'fo'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e932"></a>
+
+
+ <p>The extension functions need to know if the output format
+ is HTML ('html') or XSL Formatting Objects ('fo'). This variable answers
+ that question. Valid settings are 'html' or 'fo'.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.component.toc"></a>generate.component.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e938"></a><h2>Name</h2>generate.component.toc &#8212; Generate a table of contents for components?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e943"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.component.toc" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e946"></a>
+
+
+ <p>If non-zero, a table of contents is generated at the beginning
+ of each component (chapters, appendixes, etc.)
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.toc"></a>generate.division.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e952"></a><h2>Name</h2>generate.division.toc &#8212; Generate a table of contents for divisions?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e957"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e960"></a>
+
+
+ <p>If non-zero, a table of contents is generated at the beginning
+ of each division (sets, books, etc.)
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.figure.lot"></a>generate.division.figure.lot
+ </h1>
+ <div class="refnamediv"><a name="d41e966"></a><h2>Name</h2>generate.division.figure.lot &#8212; Generate a list of titles for Figures?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e971"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.figure.lot" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e974"></a>
+
+
+ <p>If non-zero, a list of titles is generated for Figures.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.example.lot"></a>generate.division.example.lot
+ </h1>
+ <div class="refnamediv"><a name="d41e980"></a><h2>Name</h2>generate.division.example.lot &#8212; Generate a list of titles for Examples?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e985"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.example.lot" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e988"></a>
+
+
+ <p>If non-zero, a list of titles is generated for Examples.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.equation.lot"></a>generate.division.equation.lot
+ </h1>
+ <div class="refnamediv"><a name="d41e994"></a><h2>Name</h2>generate.division.equation.lot &#8212; Generate a list of titles for Equations?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e999"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.equation.lot" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1002"></a>
+
+
+ <p>If non-zero, a list of titles is generated for Equations.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.table.lot"></a>generate.division.table.lot
+ </h1>
+ <div class="refnamediv"><a name="d41e1008"></a><h2>Name</h2>generate.division.table.lot &#8212; Generate a list of titles for Tables?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1013"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.table.lot" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1016"></a>
+
+
+ <p>If non-zero, a list of titles is generated for Tables.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.passivetex.extensions"></a>passivetex.extensions
+ </h1>
+ <div class="refnamediv"><a name="d41e1022"></a><h2>Name</h2>passivetex.extensions &#8212; Enable PassiveTeX extensions?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1027"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="passivetex.extensions" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1030"></a>
+
+
+ <p>If non-zero,
+ <a href="http://users.ox.ac.uk/~rahtz/passivetex/" target="_top">PassiveTeX</a>
+ extensions will be used. At present, this consists of PDF bookmarks
+ and sorted index terms.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.arbortext.extensions"></a>arbortext.extensions
+ </h1>
+ <div class="refnamediv"><a name="d41e1039"></a><h2>Name</h2>arbortext.extensions &#8212; Enable Arbortext extensions?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1044"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="arbortext.extensions" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1047"></a>
+
+
+ <p>If non-zero,
+ <a href="http://www.arbortext.com/" target="_top">Arbortext</a>
+ extensions will be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.fop.extensions"></a>fop.extensions
+ </h1>
+ <div class="refnamediv"><a name="d41e1056"></a><h2>Name</h2>fop.extensions &#8212; Enable FOP extensions?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1061"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="fop.extensions" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1064"></a>
+
+
+ <p>If non-zero,
+ <a href="http://xml.apache.org/fop/" target="_top">FOP</a>
+ extensions will be used. At present, this consists of PDF bookmarks.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.default.units"></a>default.units
+ </h1>
+ <div class="refnamediv"><a name="d41e1073"></a><h2>Name</h2>default.units &#8212; Default units for an unqualified dimension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1078"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="default.units" select="'pt'" doc:type="list" doc:list="cm mm in pt pc px em"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1081"></a>
+
+
+ <p>If an unqualified dimension is encountered (for example, in a
+ graphic width), the <i><tt>default-units</tt></i> will be used for the
+ units. Unqualified dimensions are not allowed in XSL Formatting Objects.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.label.from.part"></a>label.from.part
+ </h1>
+ <div class="refnamediv"><a name="d41e1090"></a><h2>Name</h2>label.from.part &#8212; Renumber chapters in each part?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1095"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="label.from.part" select="'0'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1098"></a>
+
+
+ <p>If <i><tt>label.from.part</tt></i> is non-zero, components
+ (<tt>chapter</tt>s, <tt>appendixe</tt>s, etc.)
+ will be numbered from 1 in each <tt>part</tt>. Otherwise,
+ they will be numbered monotonically throughout each
+ <tt>book</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/fo/table.html b/tests/docbook/doc/fo/table.html
new file mode 100644
index 00000000..e5a05a72
--- /dev/null
+++ b/tests/docbook/doc/fo/table.html
@@ -0,0 +1,181 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>Formatting Object Table Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.37">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>Formatting Object Table Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: all"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#template.calc.column.width">calc.column.width</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.calc.column.width"></a>calc.column.width
+ </h1>
+ <div class="refnamediv"><a name="d41e40"></a><h2>Name</h2>calc.column.width &#8212; Calculate an XSL FO table column width specification from a
+ CALS table column width specification.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e45"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="calc.column.width"&gt;
+&lt;xsl:param name="colwidth"&gt;1*&lt;/xsl:param&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e48"></a>
+
+
+ <p>CALS expresses table column widths in the following basic
+ forms:
+ </p>
+
+
+
+
+ <div class="itemizedlist">
+ <ul>
+ <li>
+ <p><a name="d41e54"></a><i>99.99units</i>, a fixed length specifier.
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e59"></a><i>99.99</i>, a fixed length specifier without any units.
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e64"></a><i>99.99*</i>, a relative length specifier.
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e69"></a><i>99.99*+99.99units</i>, a combination of both.
+ </p>
+ </li>
+ </ul>
+ </div>
+
+
+
+
+ <p>The CALS units are points (pt), picas (pi), centimeters (cm),
+ millimeters (mm), and inches (in). These are the same units as XSL,
+ except that XSL abbreviates picas "pc" instead of "pi". If a length
+ specifier has no units, the CALS default unit (pt) is assumed.
+ </p>
+
+
+
+
+ <p>Relative length specifiers are represented in XSL with the
+ proportional-column-width() function.
+ </p>
+
+
+
+
+ <p>Here are some examples:</p>
+
+
+
+
+ <div class="itemizedlist">
+ <ul>
+ <li>
+ <p><a name="d41e85"></a>"36pt" becomes "36pt"
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e88"></a>"3pi" becomes "3pc"
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e91"></a>"36" becomes "36pt"
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e94"></a>"3*" becomes "proportional-column-width(3)"
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e97"></a>"3*+2pi" becomes "proportional-column-width(3)+2pc"
+ </p>
+ </li>
+ <li>
+ <p><a name="d41e100"></a>"1*+2" becomes "proportional-column-width(1)+2pt"
+ </p>
+ </li>
+ </ul>
+ </div>
+
+
+ </div>
+ <div class="refparameter"><b><a name="d41e104"></a>Parameters</b>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><a name="d41e107"></a><span class="term">colwidth</span></dt>
+ <dd>
+ <p><a name="d41e110"></a>The CALS column width specification.
+ </p>
+ </dd>
+ </dl>
+ </div>
+
+
+ </div>
+ <div class="refreturn"><b><a name="d41e114"></a>Returns</b>
+
+
+ <p>The XSL column width specification.</p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/html/ChangeLog b/tests/docbook/doc/html/ChangeLog
new file mode 100644
index 00000000..fd19ff47
--- /dev/null
+++ b/tests/docbook/doc/html/ChangeLog
@@ -0,0 +1,4 @@
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile: New file.
+
diff --git a/tests/docbook/doc/html/ebnf.html b/tests/docbook/doc/html/ebnf.html
new file mode 100644
index 00000000..33950436
--- /dev/null
+++ b/tests/docbook/doc/html/ebnf.html
@@ -0,0 +1,103 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>HTML EBNF Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.37">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>HTML EBNF Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: all"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This reference describes the templates and parameters relevant
+ to formatting EBNF markup.
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#param.ebnf.table.bgcolor">ebnf.table.bgcolor</a></dt>
+ <dt><a href="#param.ebnf.table.border">ebnf.table.border</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.ebnf.table.bgcolor"></a>ebnf.table.bgcolor
+ </h1>
+ <div class="refnamediv"><a name="d41e42"></a><h2>Name</h2>ebnf.table.bgcolor &#8212; Background color for EBNF tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e47"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="ebnf.table.bgcolor"&gt;#F5DCB3&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e50"></a>
+
+
+ <p>Sets the background color for EBNF tables. No <tt>bgcolor</tt>
+ attribute is output if <tt>ebnf.table.bgcolor</tt> is set to
+ the null string. The default value matches the value used in recent
+ online versions of the W3C's XML Spec productions.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.ebnf.table.border"></a>ebnf.table.border
+ </h1>
+ <div class="refnamediv"><a name="d41e62"></a><h2>Name</h2>ebnf.table.border &#8212; Selects border on EBNF tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e67"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="ebnf.table.border"&gt;1&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e70"></a>
+
+
+ <p>Selects the border on EBNF tables. If non-zero, the tables have
+ borders, otherwise they don't.
+ </p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/html/param.html b/tests/docbook/doc/html/param.html
new file mode 100644
index 00000000..5d1ec029
--- /dev/null
+++ b/tests/docbook/doc/html/param.html
@@ -0,0 +1,1815 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>HTML Parameter Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.37">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>HTML Parameter Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: all"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This reference describes each of the HTML Stylesheet parameters.
+ These are the &#8220;easily customizable&#8221; parts of the stylesheet.
+ If you want to specify an alternate value for one or more of these
+ parameters, you can do so in a &#8220;driver&#8221; stylesheet.
+ </p>
+ <p>For example, if you want to change the <tt>html.stylesheet</tt>
+ to <tt>reference.css</tt>, you might create a driver
+ stylesheet like this:
+ </p><pre class="programlisting">&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'&gt;
+
+ &lt;xsl:import href="/path/to/html/docbook.xsl"/&gt;
+
+ &lt;xsl:param name="html.stylesheet"&gt;reference.css&lt;/xsl:param&gt;
+
+&lt;/xsl:stylesheet&gt;</pre><p>Naturally, you have to change the
+ <tt>href</tt> attribute on
+ <tt>&lt;xsl:import&gt;</tt>
+ to point to <tt>docbook.xsl</tt>
+ on your system. (Or <tt>chunk.xsl</tt>, if you're using
+ chunking.)
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#param.author.othername.in.middle">author.othername.in.middle</a></dt>
+ <dt><a href="#param.html.stylesheet">html.stylesheet</a></dt>
+ <dt><a href="#param.html.stylesheet.type">html.stylesheet.type</a></dt>
+ <dt><a href="#param.html.base">html.base</a></dt>
+ <dt><a href="#param.ulink.target">ulink.target</a></dt>
+ <dt><a href="#param.refentry.xref.manvolnum">refentry.xref.manvolnum</a></dt>
+ <dt><a href="#param.show.comments">show.comments</a></dt>
+ <dt><a href="#param.funcsynopsis.style">funcsynopsis.style</a></dt>
+ <dt><a href="#param.funcsynopsis.decoration">funcsynopsis.decoration</a></dt>
+ <dt><a href="#param.function.parens">function.parens</a></dt>
+ <dt><a href="#param.refentry.generate.name">refentry.generate.name</a></dt>
+ <dt><a href="#param.admon.graphics">admon.graphics</a></dt>
+ <dt><a href="#param.admon.graphics.path">admon.graphics.path</a></dt>
+ <dt><a href="#param.admon.graphics.extension">admon.graphics.extension</a></dt>
+ <dt><a href="#param.admon.style">admon.style</a></dt>
+ <dt><a href="#param.section.autolabel">section.autolabel</a></dt>
+ <dt><a href="#param.section.label.includes.component.label">section.label.includes.component.label</a></dt>
+ <dt><a href="#param.chapter.autolabel">chapter.autolabel</a></dt>
+ <dt><a href="#param.preface.autolabel">preface.autolabel</a></dt>
+ <dt><a href="#param.part.autolabel">part.autolabel</a></dt>
+ <dt><a href="#param.qandadiv.autolabel">qandadiv.autolabel</a></dt>
+ <dt><a href="#param.qanda.inherit.numeration">qanda.inherit.numeration</a></dt>
+ <dt><a href="#param.qanda.defaultlabel">qanda.defaultlabel</a></dt>
+ <dt><a href="#param.generate.qandaset.toc">generate.qandaset.toc</a></dt>
+ <dt><a href="#param.generate.qandadiv.toc">generate.qandadiv.toc</a></dt>
+ <dt><a href="#param.biblioentry.item.separator">biblioentry.item.separator</a></dt>
+ <dt><a href="#param.toc.section.depth">toc.section.depth</a></dt>
+ <dt><a href="#param.using.chunker">using.chunker</a></dt>
+ <dt><a href="#param.generate.component.toc">generate.component.toc</a></dt>
+ <dt><a href="#param.generate.division.toc">generate.division.toc</a></dt>
+ <dt><a href="#param.link.mailto.url">link.mailto.url</a></dt>
+ <dt><a href="#param.graphic.default.extension">graphic.default.extension</a></dt>
+ <dt><a href="#param.toc.list.type">toc.list.type</a></dt>
+ <dt><a href="#param.check.idref">check.idref</a></dt>
+ <dt><a href="#param.use.id.function">use.id.function</a></dt>
+ <dt><a href="#param.spacing.paras">spacing.paras</a></dt>
+ <dt><a href="#attrset.body.attrs">body.attrs mode</a></dt>
+ <dt><a href="#param.css.decoration">css.decoration</a></dt>
+ <dt><a href="#param.show.revisionflag">show.revisionflag</a></dt>
+ <dt><a href="#param.suppress.navigation">suppress.navigation</a></dt>
+ <dt><a href="#param.rootid">rootid</a></dt>
+ <dt><a href="#param.callout.list.table">callout.list.table</a></dt>
+ <dt><a href="#param.callout.graphics">callout.graphics</a></dt>
+ <dt><a href="#param.callout.graphics.extension">callout.graphics.extension</a></dt>
+ <dt><a href="#param.callout.graphics.path">callout.graphics.path</a></dt>
+ <dt><a href="#param.callout.graphics.number.limit">callout.graphics.number.limit</a></dt>
+ <dt><a href="#param.use.extensions">use.extensions</a></dt>
+ <dt><a href="#param.textinsert.extension">textinsert.extension</a></dt>
+ <dt><a href="#param.saxon.linenumbering">saxon.linenumbering</a></dt>
+ <dt><a href="#param.linenumbering.extension">linenumbering.extension</a></dt>
+ <dt><a href="#param.linenumbering.everyNth">linenumbering.everyNth</a></dt>
+ <dt><a href="#param.linenumbering.width">linenumbering.width</a></dt>
+ <dt><a href="#param.linenumbering.separator">linenumbering.separator</a></dt>
+ <dt><a href="#param.saxon.callouts">saxon.callouts</a></dt>
+ <dt><a href="#param.callouts.extension">callouts.extension</a></dt>
+ <dt><a href="#param.callout.defaultcolumn">callout.defaultcolumn</a></dt>
+ <dt><a href="#param.stylesheet.result.type">stylesheet.result.type</a></dt>
+ <dt><a href="#param.nominal.table.width">nominal.table.width</a></dt>
+ <dt><a href="#param.default.table.width">default.table.width</a></dt>
+ <dt><a href="#param.saxon.tablecolumns">saxon.tablecolumns</a></dt>
+ <dt><a href="#param.tablecolumns.extension">tablecolumns.extension</a></dt>
+ <dt><a href="#param.generate.set.toc">generate.set.toc</a></dt>
+ <dt><a href="#param.generate.book.toc">generate.book.toc</a></dt>
+ <dt><a href="#param.generate.part.toc">generate.part.toc</a></dt>
+ <dt><a href="#param.generate.reference.toc">generate.reference.toc</a></dt>
+ <dt><a href="#param.generate.preface.toc">generate.preface.toc</a></dt>
+ <dt><a href="#param.generate.chapter.toc">generate.chapter.toc</a></dt>
+ <dt><a href="#param.generate.appendix.toc">generate.appendix.toc</a></dt>
+ <dt><a href="#param.generate.article.toc">generate.article.toc</a></dt>
+ <dt><a href="#param.generate.section.toc">generate.section.toc</a></dt>
+ <dt><a href="#param.process.source.toc">process.source.toc</a></dt>
+ <dt><a href="#param.process.empty.source.toc">process.empty.source.toc</a></dt>
+ <dt><a href="#param.bridgehead.in.toc">bridgehead.in.toc</a></dt>
+ <dt><a href="#param.generate.index">generate.index</a></dt>
+ <dt><a href="#param.callout.unicode">callout.unicode</a></dt>
+ <dt><a href="#param.callout.unicode.start.character">callout.unicode.start.character</a></dt>
+ <dt><a href="#param.callout.unicode.number.limit">callout.unicode.number.limit</a></dt>
+ <dt><a href="#param.use.id.as.filename">use.id.as.filename</a></dt>
+ <dt><a href="#param.inherit.keywords">inherit.keywords</a></dt>
+ <dt><a href="#param.label.from.part">label.from.part</a></dt>
+ <dt><a href="#param.citerefentry.link">citerefentry.link</a></dt>
+ <dt><a href="#param.default.encoding">default.encoding</a></dt>
+ <dt><a href="#param.saxon.character.representation">saxon.character.representation</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.author.othername.in.middle"></a>author.othername.in.middle
+ </h1>
+ <div class="refnamediv"><a name="d41e72"></a><h2>Name</h2>author.othername.in.middle &#8212; Is <tt>othername</tt> in <tt>author</tt> a
+ middle name?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e83"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="author.othername.in.middle" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e86"></a>
+
+
+ <p>If true (non-zero), the <tt>othername</tt> of an <tt>author</tt>
+ appears between the <tt>firstname</tt> and
+ <tt>surname</tt>. Otherwise, <tt>othername</tt>
+ is suppressed.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.html.stylesheet"></a>html.stylesheet
+ </h1>
+ <div class="refnamediv"><a name="d41e107"></a><h2>Name</h2>html.stylesheet &#8212; Name of the stylesheet to use in the generated HTML
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e112"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="html.stylesheet" select="''" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e115"></a>
+
+
+ <p>The name of the stylesheet to place in the HTML <tt>LINK</tt>
+ tag, or the empty string to suppress the stylesheet <tt>LINK</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.html.stylesheet.type"></a>html.stylesheet.type
+ </h1>
+ <div class="refnamediv"><a name="d41e127"></a><h2>Name</h2>html.stylesheet.type &#8212; The type of the stylesheet used in the generated HTML
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e132"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="html.stylesheet.type" doc:type="string"&gt;text/css&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e135"></a>
+
+
+ <p>The type of the stylesheet to place in the HTML <tt>link</tt> tag.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.html.base"></a>html.base
+ </h1>
+ <div class="refnamediv"><a name="d41e144"></a><h2>Name</h2>html.base &#8212; An HTML base URI
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e149"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="html.base" doc:type="uri"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e152"></a>
+
+
+ <p>If html.base is set, it is used for the <tt>BASE</tt>
+ element in the <tt>HEAD</tt> of the HTML documents.
+ This is useful for dynamically served HTML where the base URI needs
+ to be shifted.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.ulink.target"></a>ulink.target
+ </h1>
+ <div class="refnamediv"><a name="d41e164"></a><h2>Name</h2>ulink.target &#8212; The HTML anchor target for ULinks
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e169"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="ulink.target" select="'_top'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e172"></a>
+
+
+ <p>If <i><tt>ulink.target</tt></i> is set, its value will
+ be used for the <tt>target</tt> attribute
+ on anchors generated for <tt>ulink</tt>s.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.refentry.xref.manvolnum"></a>refentry.xref.manvolnum
+ </h1>
+ <div class="refnamediv"><a name="d41e187"></a><h2>Name</h2>refentry.xref.manvolnum &#8212; Output <tt>manvolnum</tt> as part of
+ <tt>refentry</tt> cross-reference?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e198"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="refentry.xref.manvolnum" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e201"></a>
+
+
+ <p>if true (non-zero), the <tt>manvolnum</tt> is used when cross-referencing
+ <tt>refentry</tt>s, either with <tt>xref</tt>
+ or <tt>citerefentry</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.show.comments"></a>show.comments
+ </h1>
+ <div class="refnamediv"><a name="d41e219"></a><h2>Name</h2>show.comments &#8212; Display <tt>comment</tt> elements?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e227"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="show.comments" doc:type="boolean"&gt;1&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e230"></a>
+
+
+ <p>If true (non-zero), comments will be displayed, otherwise they are suppressed.
+ Comments here refers to the <tt>comment</tt> element,
+ which will be renamed <tt>remark</tt> in DocBook V4.0,
+ not XML comments (&lt;-- like this --&gt;) which are unavailable.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.funcsynopsis.style"></a>funcsynopsis.style
+ </h1>
+ <div class="refnamediv"><a name="d41e242"></a><h2>Name</h2>funcsynopsis.style &#8212; What style of 'FuncSynopsis' should be generated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e247"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="funcsynopsis.style" doc:type="list" doc:list="ansi kr"&gt;kr&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e250"></a>
+
+
+ <p>If <tt>funcsynopsis.style</tt> is <tt>ansi</tt>,
+ ANSI-style function synopses are generated for a
+ <tt>funcsynopsis</tt>, otherwise K&amp;R-style
+ function synopses are generated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.funcsynopsis.decoration"></a>funcsynopsis.decoration
+ </h1>
+ <div class="refnamediv"><a name="d41e265"></a><h2>Name</h2>funcsynopsis.decoration &#8212; Decorate elements of a FuncSynopsis?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e270"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="funcsynopsis.decoration" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e273"></a>
+
+
+ <p>If true (non-zero), elements of the FuncSynopsis will be decorated (e.g. bold or
+ italic). The decoration is controlled by functions that can be redefined
+ in a customization layer.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.function.parens"></a>function.parens
+ </h1>
+ <div class="refnamediv"><a name="d41e279"></a><h2>Name</h2>function.parens &#8212; Generate parens after a function?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e284"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="function.parens" doc:type="boolean"&gt;0&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e287"></a>
+
+
+ <p>If not 0, the formatting of
+ a <tt>&lt;function&gt;</tt> element will include
+ generated parenthesis.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.refentry.generate.name"></a>refentry.generate.name
+ </h1>
+ <div class="refnamediv"><a name="d41e296"></a><h2>Name</h2>refentry.generate.name &#8212; Output NAME header before 'RefName'(s)?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e301"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="refentry.generate.name" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e304"></a>
+
+
+ <p>If true (non-zero), a "NAME" section title is output before the list
+ of 'RefName's.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.admon.graphics"></a>admon.graphics
+ </h1>
+ <div class="refnamediv"><a name="d41e310"></a><h2>Name</h2>admon.graphics &#8212; Use graphics in admonitions?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e315"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="admon.graphics" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e318"></a>
+
+
+ <p>If true (non-zero), admonitions are presented in an alternate style that uses
+ a graphic. Default graphics are provided in the distribution.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.admon.graphics.path"></a>admon.graphics.path
+ </h1>
+ <div class="refnamediv"><a name="d41e324"></a><h2>Name</h2>admon.graphics.path &#8212; Path to admonition graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e329"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="admon.graphics.path" doc:type="string"&gt;../images/&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e332"></a>
+
+
+ <p>Sets the path, probably relative to the directory where the HTML
+ files are created, to the admonition graphics.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.admon.graphics.extension"></a>admon.graphics.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e338"></a><h2>Name</h2>admon.graphics.extension &#8212; Extension for admonition graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e343"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="admon.graphics.extension" select="'.png'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e346"></a>
+
+
+ <p>Sets the extension to use on admonition graphics.</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.admon.style"></a>admon.style
+ </h1>
+ <div class="refnamediv"><a name="d41e352"></a><h2>Name</h2>admon.style &#8212; CSS style attributes for admonitions
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e357"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="admon.style" doc:type="string"&gt;
+ &lt;xsl:text&gt;margin-left: 0.5in; margin-right: 0.5in;&lt;/xsl:text&gt;
+&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e360"></a>
+
+
+ <p>Specifies the value of the <tt>STYLE</tt>
+ attribute that should be added to admonitions.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.section.autolabel"></a>section.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e369"></a><h2>Name</h2>section.autolabel &#8212; Are sections enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e374"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="section.autolabel" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e377"></a>
+
+
+ <p>If true (non-zero), unlabeled sections will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.section.label.includes.component.label"></a>section.label.includes.component.label
+ </h1>
+ <div class="refnamediv"><a name="d41e383"></a><h2>Name</h2>section.label.includes.component.label &#8212; Do section labels include the component label?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e388"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="section.label.includes.component.label" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e391"></a>
+
+
+ <p>If true (non-zero), section labels are prefixed with the label of the
+ component that contains them.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.chapter.autolabel"></a>chapter.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e397"></a><h2>Name</h2>chapter.autolabel &#8212; Are chapters and appendixes enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e402"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="chapter.autolabel" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e405"></a>
+
+
+ <p>If true (non-zero), unlabeled chapters and appendixes will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.preface.autolabel"></a>preface.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e411"></a><h2>Name</h2>preface.autolabel &#8212; Are prefaces enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e416"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="preface.autolabel" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e419"></a>
+
+
+ <p>If true (non-zero), unlabeled prefaces will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.part.autolabel"></a>part.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e425"></a><h2>Name</h2>part.autolabel &#8212; Are parts and references enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e430"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="part.autolabel" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e433"></a>
+
+
+ <p>If true (non-zero), unlabeled parts and references will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.qandadiv.autolabel"></a>qandadiv.autolabel
+ </h1>
+ <div class="refnamediv"><a name="d41e439"></a><h2>Name</h2>qandadiv.autolabel &#8212; Are divisions in QAndASets enumerated?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e444"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="qandadiv.autolabel" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e447"></a>
+
+
+ <p>If true (non-zero), unlabeled qandadivs will be enumerated.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.qanda.inherit.numeration"></a>qanda.inherit.numeration
+ </h1>
+ <div class="refnamediv"><a name="d41e453"></a><h2>Name</h2>qanda.inherit.numeration &#8212; Does enumeration of QandASet components inherit the numeration of parent elements?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e458"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="qanda.inherit.numeration" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e461"></a>
+
+
+ <p>If true (non-zero), numbered QandADiv elements and Questions and Answers inherit
+ the numeration of the ancestors of the QandASet.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.qanda.defaultlabel"></a>qanda.defaultlabel
+ </h1>
+ <div class="refnamediv"><a name="d41e467"></a><h2>Name</h2>qanda.defaultlabel &#8212; Sets the default for defaultlabel on QandASet.
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e472"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="qanda.defaultlabel" doc:type="boolean" doc:list="qanda number none"&gt;number&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e475"></a>
+
+
+ <p>If no defaultlabel attribute is specified on a QandASet, this
+ value is used. It must be one of the legal values for the defaultlabel
+ attribute.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.qandaset.toc"></a>generate.qandaset.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e481"></a><h2>Name</h2>generate.qandaset.toc &#8212; Is a Table of Contents created for QandASets?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e486"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.qandaset.toc" doc:type="boolean"&gt;1&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e489"></a>
+
+
+ <p>If true (non-zero), a ToC is constructed for QandASets.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.qandadiv.toc"></a>generate.qandadiv.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e495"></a><h2>Name</h2>generate.qandadiv.toc &#8212; Is a Table of Contents created for QandADivs?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e500"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.qandadiv.toc" doc:type="boolean"&gt;0&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e503"></a>
+
+
+ <p>If true (non-zero), a ToC is constructed for QandADivs.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.biblioentry.item.separator"></a>biblioentry.item.separator
+ </h1>
+ <div class="refnamediv"><a name="d41e509"></a><h2>Name</h2>biblioentry.item.separator &#8212; Text to separate bibliography entries
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e514"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="biblioentry.item.separator" doc:type="string"&gt;. &lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e517"></a>
+
+
+ <p>Text to separate bibliography entries
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.toc.section.depth"></a>toc.section.depth
+ </h1>
+ <div class="refnamediv"><a name="d41e523"></a><h2>Name</h2>toc.section.depth &#8212; How deep should recursive <tt>section</tt>s appear
+ in the TOC?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e531"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="toc.section.depth" doc:type="integer" doc:min="1" doc:max="10"&gt;2&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e534"></a>
+
+
+ <p>Specifies the depth to which recursive sections should appear in the
+ TOC.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.using.chunker"></a>using.chunker
+ </h1>
+ <div class="refnamediv"><a name="d41e540"></a><h2>Name</h2>using.chunker &#8212; Will the output be chunked?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e545"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="using.chunker" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e548"></a>
+
+
+ <p>In addition to providing chunking, the chunker can cleanup a
+ number of XML to HTML issues. If the chunker is not being used, the
+ stylesheets try to avoid producing results that will not appear properly
+ in browsers.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.component.toc"></a>generate.component.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e554"></a><h2>Name</h2>generate.component.toc &#8212; Should TOCs be genereated in components (Chapters, Appendixes, etc.)?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e559"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.component.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e562"></a>
+
+
+ <p>If true (non-zero), they are.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.division.toc"></a>generate.division.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e568"></a><h2>Name</h2>generate.division.toc &#8212; Should TOCs be genereated in divisions (Books, Parts, etc.)?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e573"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.division.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e576"></a>
+
+
+ <p>If true (non-zero), they are.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.link.mailto.url"></a>link.mailto.url
+ </h1>
+ <div class="refnamediv"><a name="d41e582"></a><h2>Name</h2>link.mailto.url &#8212; Mailto URL for the LINK REL=made HTML HEAD element
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e587"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="link.mailto.url" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e590"></a>
+
+
+ <p>If not the empty string, this address will be used for the
+ REL=made <tt>LINK</tt> element in the HTML <tt>HEAD</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.graphic.default.extension"></a>graphic.default.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e602"></a><h2>Name</h2>graphic.default.extension &#8212; Default extension for graphic filenames
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e607"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="graphic.default.extension" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e610"></a>
+
+
+ <p>If a <tt>graphic</tt> or <tt>mediaobject</tt>
+ includes a reference to a filename that does not include an extension,
+ and the <tt>format</tt> attribute is
+ <i>unspecified</i>, the default extension will be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.toc.list.type"></a>toc.list.type
+ </h1>
+ <div class="refnamediv"><a name="d41e628"></a><h2>Name</h2>toc.list.type &#8212; Type of HTML list element to use for Tables of Contents
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e633"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="toc.list.type" doc:type="list" doc:list="dl ul ol"&gt;dl&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e636"></a>
+
+
+ <p>When an automatically generated Table of Contents (or List of Titles)
+ is produced, this HTML element will be used to make the list.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.check.idref"></a>check.idref
+ </h1>
+ <div class="refnamediv"><a name="d41e642"></a><h2>Name</h2>check.idref &#8212; Test the target of IDREF attributes?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e647"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="check.idref" doc:type="boolean"&gt;1&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e650"></a>
+
+
+ <p>If 1, the target of IDREF attributes are tested for presence
+ (and uniqueness). This can be very expensive in large documents.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.use.id.function"></a>use.id.function
+ </h1>
+ <div class="refnamediv"><a name="d41e656"></a><h2>Name</h2>use.id.function &#8212; Use the XPath id() function to find link targets?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e661"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="use.id.function" doc:type="boolean" select="'1'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e664"></a>
+
+
+ <p>If 1, the stylesheets use the <tt>id()</tt> function
+ to find the targets of cross reference elements. This is more
+ efficient, but only works if your XSLT processor implements the
+ <tt>id()</tt> function, naturally.
+ </p>
+
+
+
+ <p>THIS PARAMETER IS NOT SUPPORTED. IT IS ALWAYS ASSUMED TO BE 1.
+ SEE xref.xsl IF YOU NEED TO TURN IT OFF.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.spacing.paras"></a>spacing.paras
+ </h1>
+ <div class="refnamediv"><a name="d41e679"></a><h2>Name</h2>spacing.paras &#8212; Insert additional &lt;p&gt; elements for spacing?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e684"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="spacing.paras" doc:type="boolean" select="'0'"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e687"></a>
+
+
+ <p>When non-zero, additional, empty paragraphs are inserted in
+ several contexts (for example, around informal figures), to create a
+ more pleasing visual appearance in many browsers.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="attrset.body.attrs"></a>body.attrs mode
+ </h1>
+ <div class="refnamediv"><a name="d41e693"></a><h2>Name</h2>body.attrs mode &#8212; Additional attributes for the HTML body tag
+ </div>
+ <div class="refdescription"><a name="d41e698"></a>
+
+
+ <p>The attributes defined by this attribute set are added to the
+ HTML &lt;body&gt; tag.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.css.decoration"></a>css.decoration
+ </h1>
+ <div class="refnamediv"><a name="d41e704"></a><h2>Name</h2>css.decoration &#8212; Enable CSS decoration of elements
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e709"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="css.decoration" doc:type="boolean"&gt;1&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e712"></a>
+
+
+ <p>
+ If <tt>css.decoration</tt> is turned on, then HTML elements
+ produced by the
+ stylesheet may be decorated with STYLE attributes. For example, the
+ LI tags produced for list items may include a fragment of CSS in the
+ STYLE attribute which sets the CSS property "list-style-type".
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.show.revisionflag"></a>show.revisionflag
+ </h1>
+ <div class="refnamediv"><a name="d41e721"></a><h2>Name</h2>show.revisionflag &#8212; Enable decoration of elements that have a revisionflag
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e726"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="show.revisionflag" doc:type="boolean"&gt;0&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e729"></a>
+
+
+ <p>
+ If <tt>show.revisionflag</tt> is turned on, then the stylesheets
+ may produce additional markup designed to allow a CSS stylesheet to
+ highlight elements that have specific revisionflag settings.
+ </p>
+
+
+
+
+ <p>The markup inserted will be usually be either a &lt;span&gt; or &lt;div&gt;
+ with an appropriate <tt>class</tt> attribute. (The value of
+ the class attribute will be the same as the value of the revisionflag
+ attribute). In some contexts, for example tables, where extra markup
+ would be structurally illegal, the class attribute will be added to the
+ appropriate container element.
+ </p>
+
+
+
+
+ <p>In general, the stylesheets only test for revisionflag in contexts
+ where an importing stylesheet would have to redefine whole templates.
+ Most of the revisionflag processing is expected to be done by another
+ stylesheet, for example <tt>changebars.xsl</tt>.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.suppress.navigation"></a>suppress.navigation
+ </h1>
+ <div class="refnamediv"><a name="d41e750"></a><h2>Name</h2>suppress.navigation &#8212; Disable header and footer navigation
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e755"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="suppress.navigation" doc:type="boolean"&gt;0&lt;/xsl:param&gt;</pre></div>
+ <div class="refdescription"><a name="d41e758"></a>
+
+
+ <p>
+ If <tt>suppress.navigation</tt> is turned on, header and
+ footer navigation will be suppressed.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.rootid"></a>rootid
+ </h1>
+ <div class="refnamediv"><a name="d41e767"></a><h2>Name</h2>rootid &#8212; Specify the root element to format
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e772"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="rootid" select="''" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e775"></a>
+
+
+ <p>If <i><tt>rootid</tt></i> is specified, it must be the
+ value of an ID that occurs in the document being formatted. The entire
+ document will be loaded and parsed, but formatting will begin at the
+ element identified, rather than at the root. For example, this allows
+ you to process only chapter 4 of a book.
+ </p>
+
+
+
+ <p>Because the entire document is available to the processor, automatic
+ numbering, cross references, and other dependencies are correctly
+ resolved.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.list.table"></a>callout.list.table
+ </h1>
+ <div class="refnamediv"><a name="d41e787"></a><h2>Name</h2>callout.list.table &#8212; Present callout lists using a table?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e792"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.list.table" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e795"></a>
+
+
+ <p>The default presentation of <tt>CalloutList</tt>s uses
+ an HTML <tt>DL</tt>. Some browsers don't align DLs very well
+ if <i><tt>callout.graphics</tt></i> are used. With this option
+ turned on, <tt>CalloutList</tt>s are presented in an HTML
+ <tt>TABLE</tt>, which usually results in better alignment
+ of the callout number with the callout description.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics"></a>callout.graphics
+ </h1>
+ <div class="refnamediv"><a name="d41e816"></a><h2>Name</h2>callout.graphics &#8212; Use graphics for callouts?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e821"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e824"></a>
+
+
+ <p>If non-zero, callouts are presented with graphics (e.g., reverse-video
+ circled numbers instead of "(1)", "(2)", etc.).
+ Default graphics are provided in the distribution.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.extension"></a>callout.graphics.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e830"></a><h2>Name</h2>callout.graphics.extension &#8212; Extension for callout graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e835"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.extension" select="'.png'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e838"></a>
+
+
+ <p>Sets the extension to use on callout graphics.</p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.path"></a>callout.graphics.path
+ </h1>
+ <div class="refnamediv"><a name="d41e844"></a><h2>Name</h2>callout.graphics.path &#8212; Path to callout graphics
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e849"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.path" select="'../images/callouts/'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e852"></a>
+
+
+ <p>Sets the path, probably relative to the directory where the HTML
+ files are created, to the callout graphics.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.graphics.number.limit"></a>callout.graphics.number.limit
+ </h1>
+ <div class="refnamediv"><a name="d41e858"></a><h2>Name</h2>callout.graphics.number.limit &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e863"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.graphics.number.limit" select="'10'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e866"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.use.extensions"></a>use.extensions
+ </h1>
+ <div class="refnamediv"><a name="d41e878"></a><h2>Name</h2>use.extensions &#8212; Enable extensions
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e883"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="use.extensions" select="'0'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e886"></a>
+
+
+ <p>If non-zero, extensions may be used. Each extension is
+ further controlled by its own parameter. But if
+ <i><tt>use.extensions</tt></i> is zero, no extensions will
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.textinsert.extension"></a>textinsert.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e895"></a><h2>Name</h2>textinsert.extension &#8212; Enable the textinsert extension element
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e900"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="textinsert.extension" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e903"></a>
+
+
+ <p>The textinsert extension element inserts the contents of a
+ a file into the result tree (as text).
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.saxon.linenumbering"></a>saxon.linenumbering
+ </h1>
+ <div class="refnamediv"><a name="d41e909"></a><h2>Name</h2>saxon.linenumbering &#8212; Enable the line numbering extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e914"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="saxon.linenumbering" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e917"></a>
+
+
+ <p>If true, verbatim environments (elements that have the
+ format='linespecific' notation attribute: address, literallayout,
+ programlisting, screen, synopsis) that specify line numbering will
+ have, surprise, line numbers.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.extension"></a>linenumbering.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e923"></a><h2>Name</h2>linenumbering.extension &#8212; Enable the line numbering extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e928"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.extension" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e931"></a>
+
+
+ <p>If true, verbatim environments (elements that have the
+ format='linespecific' notation attribute: address, literallayout,
+ programlisting, screen, synopsis) that specify line numbering will
+ have, surprise, line numbers.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.everyNth"></a>linenumbering.everyNth
+ </h1>
+ <div class="refnamediv"><a name="d41e937"></a><h2>Name</h2>linenumbering.everyNth &#8212; Indicate which lines should be numbered
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e942"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.everyNth" select="'5'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e945"></a>
+
+
+ <p>If line numbering is enabled, everyNth line will be numbered.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.width"></a>linenumbering.width
+ </h1>
+ <div class="refnamediv"><a name="d41e951"></a><h2>Name</h2>linenumbering.width &#8212; Indicates the width of line numbers
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e956"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.width" select="'3'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e959"></a>
+
+
+ <p>If line numbering is enabled, line numbers will appear right
+ justified in a field "width" characters wide.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.linenumbering.separator"></a>linenumbering.separator
+ </h1>
+ <div class="refnamediv"><a name="d41e965"></a><h2>Name</h2>linenumbering.separator &#8212; Specify a separator between line numbers and lines
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e970"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="linenumbering.separator" select="' '" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e973"></a>
+
+
+ <p>The separator is inserted between line numbers and lines in
+ the verbatim environment.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.saxon.callouts"></a>saxon.callouts
+ </h1>
+ <div class="refnamediv"><a name="d41e979"></a><h2>Name</h2>saxon.callouts &#8212; Enable the callout extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e984"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="saxon.callouts" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e987"></a>
+
+
+ <p>The callouts extension processes <tt>areaset</tt>
+ elements in <tt>ProgramListingCO</tt> and other text-based
+ callout elements.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callouts.extension"></a>callouts.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e999"></a><h2>Name</h2>callouts.extension &#8212; Enable the callout extension
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1004"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callouts.extension" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1007"></a>
+
+
+ <p>The callouts extension processes <tt>areaset</tt>
+ elements in <tt>ProgramListingCO</tt> and other text-based
+ callout elements.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.defaultcolumn"></a>callout.defaultcolumn
+ </h1>
+ <div class="refnamediv"><a name="d41e1019"></a><h2>Name</h2>callout.defaultcolumn &#8212; Indicates what column callouts appear in by default
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1024"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.defaultcolumn" select="'60'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1027"></a>
+
+
+ <p>If a callout does not identify a column (for example, if it uses
+ the <tt>linerange</tt> <tt>unit</tt>),
+ it will appear in the default column.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.stylesheet.result.type"></a>stylesheet.result.type
+ </h1>
+ <div class="refnamediv"><a name="d41e1039"></a><h2>Name</h2>stylesheet.result.type &#8212; Identifies the output format of this stylesheet
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1044"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="stylesheet.result.type" select="'html'" doc:type="list" doc:list="html fo"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1047"></a>
+
+
+ <p>The Saxon extension functions need to know if the output format
+ is HTML ('html') or XSL Formatting Objects ('fo'). This variable answers
+ that question. Valid settings are 'html' or 'fo'.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.nominal.table.width"></a>nominal.table.width
+ </h1>
+ <div class="refnamediv"><a name="d41e1053"></a><h2>Name</h2>nominal.table.width &#8212; The (absolute) nominal width of tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1058"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="nominal.table.width" select="'6in'" doc:type="length"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1061"></a>
+
+
+ <p>In order to convert CALS column widths into HTML column widths, it
+ is sometimes necessary to have an absolute table width to use for conversion
+ of mixed absolute and relative widths. This value must be an absolute
+ length (not a percentag).
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.default.table.width"></a>default.table.width
+ </h1>
+ <div class="refnamediv"><a name="d41e1067"></a><h2>Name</h2>default.table.width &#8212; The default width of tables
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1072"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="default.table.width" select="''" doc:type="length"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1075"></a>
+
+
+ <p>If specified, this value will be used for the WIDTH attribute on
+ tables that do not specify an alternate width (with the dbhtml processing
+ instruction).
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.saxon.tablecolumns"></a>saxon.tablecolumns
+ </h1>
+ <div class="refnamediv"><a name="d41e1081"></a><h2>Name</h2>saxon.tablecolumns &#8212; Enable the table columns extension function
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1086"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="saxon.tablecolumns" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1089"></a>
+
+
+ <p>The table columns extension function adjusts the widths of table
+ columns in the HTML result to more accurately reflect the specifications
+ in the CALS table.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.tablecolumns.extension"></a>tablecolumns.extension
+ </h1>
+ <div class="refnamediv"><a name="d41e1095"></a><h2>Name</h2>tablecolumns.extension &#8212; Enable the table columns extension function
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1100"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="tablecolumns.extension" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1103"></a>
+
+
+ <p>The table columns extension function adjusts the widths of table
+ columns in the HTML result to more accurately reflect the specifications
+ in the CALS table.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.set.toc"></a>generate.set.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1109"></a><h2>Name</h2>generate.set.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1114"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.set.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1117"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.book.toc"></a>generate.book.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1123"></a><h2>Name</h2>generate.book.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1128"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.book.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1131"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.part.toc"></a>generate.part.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1137"></a><h2>Name</h2>generate.part.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1142"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.part.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1145"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.reference.toc"></a>generate.reference.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1151"></a><h2>Name</h2>generate.reference.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1156"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.reference.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1159"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.preface.toc"></a>generate.preface.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1165"></a><h2>Name</h2>generate.preface.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1170"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.preface.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1173"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.chapter.toc"></a>generate.chapter.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1179"></a><h2>Name</h2>generate.chapter.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1184"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.chapter.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1187"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.appendix.toc"></a>generate.appendix.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1193"></a><h2>Name</h2>generate.appendix.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1198"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.appendix.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1201"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.article.toc"></a>generate.article.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1207"></a><h2>Name</h2>generate.article.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1212"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.article.toc" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1215"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.section.toc"></a>generate.section.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1221"></a><h2>Name</h2>generate.section.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1226"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.section.toc" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1229"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.process.source.toc"></a>process.source.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1235"></a><h2>Name</h2>process.source.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1240"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="process.source.toc" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1243"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.process.empty.source.toc"></a>process.empty.source.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1249"></a><h2>Name</h2>process.empty.source.toc &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1254"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="process.empty.source.toc" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1257"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.bridgehead.in.toc"></a>bridgehead.in.toc
+ </h1>
+ <div class="refnamediv"><a name="d41e1263"></a><h2>Name</h2>bridgehead.in.toc &#8212; Should bridgehead elements appear in the TOC?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1268"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="bridgehead.in.toc" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1271"></a>
+
+
+ <p>If non-zero, bridgeheads appear in the TOC. Note that this option
+ is not fully supported and may be removed in a future version of the
+ stylesheets.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.generate.index"></a>generate.index
+ </h1>
+ <div class="refnamediv"><a name="d41e1277"></a><h2>Name</h2>generate.index &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1282"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="generate.index" select="1" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1285"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode"></a>callout.unicode
+ </h1>
+ <div class="refnamediv"><a name="d41e1291"></a><h2>Name</h2>callout.unicode &#8212; FIXME:
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1296"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode" select="0" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1299"></a>
+
+
+ <p>FIXME:
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode.start.character"></a>callout.unicode.start.character
+ </h1>
+ <div class="refnamediv"><a name="d41e1305"></a><h2>Name</h2>callout.unicode.start.character &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1310"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode.start.character" select="10102" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1313"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.callout.unicode.number.limit"></a>callout.unicode.number.limit
+ </h1>
+ <div class="refnamediv"><a name="d41e1325"></a><h2>Name</h2>callout.unicode.number.limit &#8212; Number of the largest callout graphic
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1330"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="callout.unicode.number.limit" select="'10'" doc:type="integer"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1333"></a>
+
+
+ <p>If <i><tt>callout.graphics</tt></i>
+ is non-zero, graphics are used to represent
+ callout numbers. The value of
+ <i><tt>callout.graphics.number.limit</tt></i>
+ is
+ the largest number for which a graphic exists. If the callout number
+ exceeds this limit, the default presentation "(nnn)" will always
+ be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.use.id.as.filename"></a>use.id.as.filename
+ </h1>
+ <div class="refnamediv"><a name="d41e1345"></a><h2>Name</h2>use.id.as.filename &#8212; Use ID value of chunk elements as the filename?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1350"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="use.id.as.filename" select="'0'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1353"></a>
+
+
+ <p>If <i><tt>use.id.as.filename</tt></i>
+ is non-zero, the filename of chunk elements that have IDs will be
+ derived from the ID value.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.inherit.keywords"></a>inherit.keywords
+ </h1>
+ <div class="refnamediv"><a name="d41e1362"></a><h2>Name</h2>inherit.keywords &#8212; Inherit keywords from ancestor elements?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1367"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="inherit.keywords" select="'1'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1370"></a>
+
+
+ <p>If <i><tt>inherit.keywords</tt></i>
+ is non-zero, the keyword <tt>META</tt> for each HTML
+ <tt>HEAD</tt> element will include all of the keywords from
+ ancestral elements. Otherwise, only the keywords from the current section
+ will be used.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.label.from.part"></a>label.from.part
+ </h1>
+ <div class="refnamediv"><a name="d41e1385"></a><h2>Name</h2>label.from.part &#8212; Renumber chapters in each part?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1390"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="label.from.part" select="'0'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1393"></a>
+
+
+ <p>If <i><tt>label.from.part</tt></i> is non-zero, components
+ (<tt>chapter</tt>s, <tt>appendixe</tt>s, etc.)
+ will be numbered from 1 in each <tt>part</tt>. Otherwise,
+ they will be numbered monotonically throughout each
+ <tt>book</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.citerefentry.link"></a>citerefentry.link
+ </h1>
+ <div class="refnamediv"><a name="d41e1414"></a><h2>Name</h2>citerefentry.link &#8212; Generate URL links when cross-referencing RefEntrys?
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1419"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="citerefentry.link" select="'0'" doc:type="boolean"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1422"></a>
+
+
+ <p>If true, a web link will be generated, presumably
+ to an online man-&gt;HTML gateway. The text of the link is
+ generated by the generate.citerefentry.link template.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.default.encoding"></a>default.encoding
+ </h1>
+ <div class="refnamediv"><a name="d41e1428"></a><h2>Name</h2>default.encoding &#8212; Encoding used in generated HTML pages
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1433"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="default.encoding" select="'ISO-8859-1'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1436"></a>
+
+
+ <p>This encoding is used in files generated by chunking stylesheet. Currently
+ only Saxon is able to change output encoding.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="param.saxon.character.representation"></a>saxon.character.representation
+ </h1>
+ <div class="refnamediv"><a name="d41e1442"></a><h2>Name</h2>saxon.character.representation &#8212; Saxon character representation used in generated HTML pages
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e1447"></a><h2>Synopsis</h2><pre class="synopsis">
+&lt;xsl:param name="saxon.character.representation" select="'entity;decimal'" doc:type="string"/&gt;</pre></div>
+ <div class="refdescription"><a name="d41e1450"></a>
+
+
+ <p>This character representation is used in files generated by chunking stylesheet. If
+ you want to suppress entity references for characters with direct representation
+ in default.encoding, set this parameter to value <tt>native</tt>.
+
+ </p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/index.html b/tests/docbook/doc/index.html
new file mode 100644
index 00000000..832a2b92
--- /dev/null
+++ b/tests/docbook/doc/index.html
@@ -0,0 +1,3 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>DocBook XSL Stylesheet Documentation</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="next" href="pr01.html" title="Preface"></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">DocBook XSL Stylesheet Documentation</th></tr><tr><td width="20%" align="left">&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a href="pr01.html">Next</a></td></tr></table><hr></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left">&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a href="pr01.html">Next</a></td></tr><tr><td width="40%" align="left">&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;Preface</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/jrefhtml.xsl b/tests/docbook/doc/jrefhtml.xsl
new file mode 100644
index 00000000..acf2c7c3
--- /dev/null
+++ b/tests/docbook/doc/jrefhtml.xsl
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="../docsrc/jrefhtml.xsl"/>
+
+<xsl:param name="html.stylesheet" select="'../reference.css'"/>
+
+<xsl:template match="copyright" mode="titlepage.mode">
+ <xsl:variable name="years" select="year"/>
+ <xsl:variable name="holders" select="holder"/>
+
+ <p class="{name(.)}">
+ <a href="../copyright.html">
+ <xsl:call-template name="gentext.element.name"/>
+ </a>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="dingbat">
+ <xsl:with-param name="dingbat">copyright</xsl:with-param>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext.by"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+ <xsl:text>. </xsl:text>
+ <a href="../warranty.html">No Warranty</a>
+ <xsl:text>.</xsl:text>
+ </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/doc/lib/ChangeLog b/tests/docbook/doc/lib/ChangeLog
new file mode 100644
index 00000000..fd19ff47
--- /dev/null
+++ b/tests/docbook/doc/lib/ChangeLog
@@ -0,0 +1,4 @@
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * .cvsignore, Makefile: New file.
+
diff --git a/tests/docbook/doc/lib/lib.html b/tests/docbook/doc/lib/lib.html
new file mode 100644
index 00000000..c7f05bc2
--- /dev/null
+++ b/tests/docbook/doc/lib/lib.html
@@ -0,0 +1,161 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+ <title>Library Template Reference</title>
+ <link rel="stylesheet" href="../reference.css" type="text/css">
+ <meta name="generator" content="DocBook XSL Stylesheets V1.37">
+ </head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div class="reference">
+ <div class="titlepage">
+ <div>
+ <h1 class="title"><a name="d41e1"></a>Library Template Reference
+ </h1>
+ </div>
+ <div>
+ <h3 class="author">Norman Walsh</h3>
+ </div>
+ <div>
+ <p class="releaseinfo">
+ $Id$
+
+ </p>
+ </div>
+ <div>
+ <p class="copyright"><a href="../copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="../warranty.html">No Warranty</a>.
+ </p>
+ </div>
+ <hr>
+ </div>
+ <div class="partintro">
+ <div></div>
+ <div class="section"><a name="d41e24"></a><div class="titlepage">
+ <div>
+ <h2 class="title" style="clear: all"><a name="d41e24"></a>Introduction
+ </h2>
+ </div>
+ </div>
+ <p>This is technical reference documentation for the DocBook XSL
+ Stylesheets; it documents (some of) the parameters, templates, and
+ other elements of the stylesheets.
+ </p>
+ <p>This is not intended to be &#8220;user&#8221; documentation.
+ It is provided for developers writing customization layers for the
+ stylesheets, and for anyone who's interested in &#8220;how it
+ works&#8221;.
+ </p>
+ <p>Although I am trying to be thorough, this documentation is known
+ to be incomplete. Don't forget to read the source, too :-)
+ </p>
+ </div>
+ <div class="toc">
+ <p><b>Table of Contents</b></p>
+ <dl>
+ <dt><a href="#template.string.subst">string.subst</a></dt>
+ <dt><a href="#template.xpointer.idref">xpointer.idref</a></dt>
+ <dt><a href="#template.length-magnitude">length-magnitude</a></dt>
+ <dt><a href="#template.length-spec">length-spec</a></dt>
+ </dl>
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.string.subst"></a>string.subst
+ </h1>
+ <div class="refnamediv"><a name="d41e40"></a><h2>Name</h2>string.subst &#8212; Substitute one text string for another in a string
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e45"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="string.subst"&gt;
+&lt;xsl:param name="string"/&gt;
+&lt;xsl:param name="target"/&gt;
+&lt;xsl:param name="replacement"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e48"></a>
+
+
+ <p>The <tt>string.subst</tt> template replaces all
+ occurances of <i><tt>target</tt></i> in <i><tt>string</tt></i>
+ with <i><tt>replacement</tt></i> and returns the result.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.xpointer.idref"></a>xpointer.idref
+ </h1>
+ <div class="refnamediv"><a name="d41e66"></a><h2>Name</h2>xpointer.idref &#8212; Extract IDREF from an XPointer
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e71"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="xpointer.idref"&gt;
+&lt;xsl:param name="xpointer"&gt;http://...&lt;/xsl:param&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e74"></a>
+
+
+ <p>The <tt>xpointer.idref</tt> template returns the
+ ID portion of an XPointer which is a pointer to an ID within the current
+ document, or the empty string if it is not.
+ </p>
+
+
+
+ <p>In other words, <tt>xpointer.idref</tt> returns
+ &#8220;foo&#8221; when passed either <tt>#foo</tt>
+ or <tt>#xpointer(id('foo'))</tt>, otherwise it returns
+ the empty string.
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.length-magnitude"></a>length-magnitude
+ </h1>
+ <div class="refnamediv"><a name="d41e98"></a><h2>Name</h2>length-magnitude &#8212; Return the unqualified dimension from a length specification
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e103"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="length-magnitude"&gt;
+&lt;xsl:param name="length" select="'0pt'"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e106"></a>
+
+
+ <p>The <tt>length-magnitude</tt> template returns the
+ unqualified length ("20" for "20pt") from a dimension.
+
+ </p>
+
+
+ </div>
+ </div>
+ <hr>
+ <div class="refentry">
+ <h1 class="title"><a name="template.length-spec"></a>length-spec
+ </h1>
+ <div class="refnamediv"><a name="d41e115"></a><h2>Name</h2>length-spec &#8212; Return a fully qualified length specification
+ </div>
+ <div class="refsynopsisdiv"><a name="d41e120"></a><h2>Synopsis</h2><pre class="synopsis">&lt;xsl:template name="length-spec"&gt;
+&lt;xsl:param name="length" select="'0pt'"/&gt;
+&lt;xsl:param name="default.units" select="'pt'"/&gt;
+ ...
+&lt;/xsl:template&gt;</pre></div>
+ <div class="refdescription"><a name="d41e123"></a>
+
+
+ <p>The <tt>length-spec</tt> template returns the
+ qualified length from a dimension. If an unqualified length is given,
+ the <i><tt>default.units</tt></i> will be added to it.
+
+ </p>
+
+
+ </div>
+ </div>
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/tests/docbook/doc/pr01.html b/tests/docbook/doc/pr01.html
new file mode 100644
index 00000000..e5428679
--- /dev/null
+++ b/tests/docbook/doc/pr01.html
@@ -0,0 +1,4 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Preface</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="previous" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="next" href="publishing.html" title="Chapter 1. DocBook XSL"></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">Preface</th></tr><tr><td width="20%" align="left"><a href="index.html">Prev</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a href="publishing.html">Next</a></td></tr></table><hr></div><p>This is the beginnings of documentation for the DocBook XSL
+Stylesheets.</p><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="index.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="publishing.html">Next</a></td></tr><tr><td width="40%" align="left">DocBook XSL Stylesheet Documentation&nbsp;</td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right">&nbsp;Chapter 1. DocBook XSL</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/publishing.html b/tests/docbook/doc/publishing.html
new file mode 100644
index 00000000..7154597a
--- /dev/null
+++ b/tests/docbook/doc/publishing.html
@@ -0,0 +1,52 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Chapter 1. DocBook XSL</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"><link rel="home" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="up" href="index.html" title="DocBook XSL Stylesheet Documentation"><link rel="previous" href="pr01.html" title="Preface"><link rel="next" href="ch01s02.html" title="A brief introduction to XSL"></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">Chapter 1. DocBook XSL</th></tr><tr><td width="20%" align="left"><a href="pr01.html">Prev</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a href="ch01s02.html">Next</a></td></tr></table><hr></div><p>There is a growing list of tools to process DocBook
+ documents using XSL stylesheets. Each tool implements parts
+ or all of the XSL standard, which actually has several
+ components:
+ <div class="variablelist"><dl><dt><a name="c44b1b3b4b2b2b1"></a><span class="term">Extensible Stylesheet Language (XSL)</span></dt><dd><p><a name="c44b1b3b4b2b2b1b2"></a>A language for expressing stylesheets written
+ in XML. It includes the formatting object language, but
+ refers to separate documents for the transformation
+ language and the path language.</p></dd><dt><a name="c44b1b3b4b2b2b2"></a><span class="term">XSL Transformation (XSLT)</span></dt><dd><p><a name="c44b1b3b4b2b2b2b2"></a>The part of XSL for transforming XML documents
+ into other XML documents, HTML, or text. It can be used to
+ rearrange the content and generate new content.</p></dd><dt><a name="c44b1b3b4b2b2b3"></a><span class="term">XML Path Language (XPath)</span></dt><dd><p><a name="c44b1b3b4b2b2b3b2"></a>A language for addressing parts of an XML
+ document. It is used to find the parts of your document to
+ apply different styles to. All XSL processors use this
+ component.</p></dd></dl></div></p><p>To publish HTML from your XML documents, you just
+ need an XSLT engine. To get to print, you need an XSLT
+ engine to produce formatting objects (FO), which then must
+ be processed with a formatting object processor to produce
+ PostScript or PDF output.</p><p>James Clark's XT was the first useful XSLT engine,
+ and it is still in wide use. It is written in Java, so it
+ runs on many platforms, and it is free (
+ <a href="http://www.jclark.com" target="_top">http://www.jclark.com</a>).
+ XT comes with James Clark's nonvalidating parser XP, but
+ you can substitute a different Java parser. Here is a
+ simple example of using XT from the Unix command line to
+ produce HTML: You'll need to alter your
+ <i><tt>CLASSPATH</tt></i> environment variable to
+ include the path to where you put the
+ <tt>.jar</tt> files from the XT
+ distribution.</p><pre class="screen">CLASSPATH=xt.jar:xp.jar:sax.jar
+export CLASSPATH
+java com.jclark.xsl.sax.Driver <i><tt>filename.xml</tt></i> <i><tt>docbook/html/docbook.xsl</tt></i> &gt; <i><tt>output.html</tt></i></pre><p>If you replace the HTML stylesheet with a
+ formatting object stylesheet, XT will produce a formatting
+ object file. Then you can convert that to PDF using FOP, a
+ formatting object processor available for free from the
+ Apache XML Project (
+ <a href="http://xml.apache.org" target="_top">http://xml.apache.org</a>).
+ Here is an example of that two stage processing:</p><pre class="screen">CLASSPATH=xt.jar:xp.jar:sax.jar:fop.jar
+export CLASSPATH
+java com.jclark.xsl.sax.Driver <i><tt>filename.xml</tt></i> <i><tt>docbook/fo/docbook.xsl</tt></i> &gt; <i><tt>output.fo</tt></i>
+java org.apache.fop.apps.CommandLine <i><tt>output.fo</tt></i> <i><tt>output.pdf</tt></i></pre><p>As of this writing, some other XSLT processors to
+ choose from include:</p><div class="itemizedlist"><ul><li><p><a name="c44b1b3b4b9b1"></a>4XSLT, written in Python, from FourThought LLC (
+ <a href="http://www.fourthought.com" target="_top">http://www.fourthought.com</a>)</p></li><li><p><a name="c44b1b3b4b9b2"></a>Sablotron, written in C++, from Ginger Alliance (
+
+ <a href="http://www.gingerall.com" target="_top">http://www.gingerall.com</a>)</p></li><li><p><a name="c44b1b3b4b9b3"></a>Saxon, written in Java, from Michael Kay (
+ <a href="http://users.iclway.co.uk/mhkay/saxon" target="_top">http://users.iclway.co.uk/mhkay/saxon</a>)</p></li><li><p><a name="c44b1b3b4b9b4"></a>Xalan, written in Java, from the Apache XML
+ Project (
+ <a href="http://xml.apache.org" target="_top">http://xml.apache.org</a>)</p></li><li><p><a name="c44b1b3b4b9b5"></a>XML::XSLT,written in Perl, from Geert Josten and
+ Egon Willighagen (
+ <a href="http://www.cpan.org" target="_top">http://www.cpan.org</a>)</p></li></ul></div><p>For print output, these additional tools are available for processing formatting objects:</p><div class="itemizedlist"><ul><li><p><a name="c44b1b3b4c11b1"></a>XEP (written in Java) from
+ RenderX (
+ <a href="http://www.renderx.com" target="_top">http://www.renderx.com</a>).</p></li><li><p><a name="c44b1b3b4c11b2"></a>PassiveTeX from Sebastian Rahtz (<a href="http://users.ox.ac.uk/~rahtz/passivetex/" target="_top">http://users.ox.ac.uk/~rahtz/passivetex/</a>).</p></li></ul></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a href="pr01.html">Prev</a>&nbsp;</td><td width="20%" align="center"><a href="index.html">Home</a></td><td width="40%" align="right">&nbsp;<a href="ch01s02.html">Next</a></td></tr><tr><td width="40%" align="left">Preface&nbsp;</td><td width="20%" align="center"><a href="index.html">Up</a></td><td width="40%" align="right">&nbsp;A brief introduction to XSL</td></tr></table></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/reference.css b/tests/docbook/doc/reference.css
new file mode 100644
index 00000000..b4ff6c72
--- /dev/null
+++ b/tests/docbook/doc/reference.css
@@ -0,0 +1,4 @@
+/* reference.css, a stylesheet for reference documentation */
+
+div.legalnotice { font-size: 80%; }
+
diff --git a/tests/docbook/doc/reference.html b/tests/docbook/doc/reference.html
new file mode 100644
index 00000000..bf8a6150
--- /dev/null
+++ b/tests/docbook/doc/reference.html
@@ -0,0 +1,9 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>DocBook XSL Stylesheet Reference Documentation</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.39"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="c40b1"><div class="titlepage"><div><h1 class="title"><a name="c40b1"></a>DocBook XSL Stylesheet Reference Documentation</h1></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="releaseinfo">
+$Id$
+</p></div><div><p class="copyright"><a href="copyright.html">Copyright</a> &copy; 1999, 2000 by Norman Walsh. <a href="warranty.html">No Warranty</a>.</p></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#c40b1b2">Preface</a></dt></dl></div><div id="c40b1b2" class="preface"><div class="titlepage"><div><h2 class="title"><a name="c40b1b2"></a>Preface</h2></div></div><p>This constitutes only the most rudimentary beginnings of
+documentation for these stylesheets.</p><p>At present, the only documentation available is the set
+of references generated from the stylesheet sources:</p><div class="itemizedlist"><ul><li><p><a name="c40b1b2b4b1"></a><i><a href="lib/lib.html">Library Template Reference</a></i></p></li><li><p><a name="c40b1b2b4b2"></a><i><a href="common/common.html">Common Template Reference</a></i></p></li><li><p><a name="c40b1b2b4b3"></a><i><a href="html/param.html">HTML Parameter Reference</a></i></p></li><li><p><a name="c40b1b2b4b4"></a><i><a href="html/ebnf.html">HTML EBNF Reference</a></i></p></li><li><p><a name="c40b1b2b4b5"></a><i><a href="fo/param.html">Formatting Object Parameter Reference</a></i></p></li><li><p><a name="c40b1b2b4b6"></a><i><a href="fo/table.html">Formatting Object Table Reference</a></i></p></li></ul></div><p>The reference to the template system is also available,
+but at this point it's probably even less useful than the preceding
+references.</p><div class="itemizedlist"><ul><li><p><a name="c40b1b2b6b1"></a><i><a href="template/titlepage.html">Template Stylesheet Reference</a></i></p></li></ul></div></div></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/doc/reference.xsl b/tests/docbook/doc/reference.xsl
new file mode 100644
index 00000000..871d6556
--- /dev/null
+++ b/tests/docbook/doc/reference.xsl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="../html/docbook.xsl"/>
+
+<xsl:param name="html.stylesheet" select="'reference.css'"/>
+
+<xsl:template match="/legalnotice">
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="olink[@type='title']">
+ <xsl:variable name="xml"
+ select="document(unparsed-entity-uri(@targetdocent))"/>
+ <xsl:variable name="title" select="($xml/*/title[1]
+ |$xml/*/bookinfo/title[1]
+ |$xml/*/referenceinfo/title[1])[1]"/>
+ <i>
+ <a href="{@localinfo}">
+ <xsl:apply-templates select="$title/*|$title/text()"/>
+ </a>
+ </i>
+</xsl:template>
+
+<xsl:template match="copyright" mode="titlepage.mode">
+ <xsl:variable name="years" select="year"/>
+ <xsl:variable name="holders" select="holder"/>
+
+ <p class="{name(.)}">
+ <a href="copyright.html">
+ <xsl:call-template name="gentext.element.name"/>
+ </a>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="dingbat">
+ <xsl:with-param name="dingbat">copyright</xsl:with-param>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext.by"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+ <xsl:text>. </xsl:text>
+ <a href="warranty.html">No Warranty</a>
+ <xsl:text>.</xsl:text>
+ </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/doc/warranty.html b/tests/docbook/doc/warranty.html
new file mode 100644
index 00000000..22b1d08c
--- /dev/null
+++ b/tests/docbook/doc/warranty.html
@@ -0,0 +1,10 @@
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Warranty</title><link rel="stylesheet" href="reference.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.37"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="legalnotice"><p class="legalnotice-title"><b>Warranty</b></p><p>THE SOFTWARE IS PROVIDED &#8220;AS IS&#8221;,
+WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY
+OTHER CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.</p></div></body></html> \ No newline at end of file
diff --git a/tests/docbook/fo/ChangeLog b/tests/docbook/fo/ChangeLog
index 3c629834..9539ee2a 100644
--- a/tests/docbook/fo/ChangeLog
+++ b/tests/docbook/fo/ChangeLog
@@ -1,172 +1,124 @@
-2001-01-30 Norman Walsh <ndw@nwalsh.com>
+2001-06-14 Norman Walsh <nwalsh@users.sourceforge.net>
- * index.xsl, param.xsl: Added support for indexing, with PassiveTeX support for sorted index page numbers
+ * sections.xsl: Bug fix: section autolabelling wasn't working in division bodies
- * inline.xsl: Added varname
+ * titlepage.templates.xml: Changed text-alignment on centered titles to be 'center' rather than 'justify'
-2001-01-28 Norman Walsh <ndw@nwalsh.com>
+ * xref.xsl: Added anchor template
- * admon.xsl: Improve support for admon graphics
+2001-06-13 Norman Walsh <nwalsh@users.sourceforge.net>
- * autotoc.xsl, index.xsl: First attempt at support for automatic indexing
+ * graphics.xsl, param.xsl: Support Arbortext extensions--at the moment, just to turn off the url() stuff in external graphic references
- * biblio.xsl: Support shortaffil and jobtitle in bibliomixed
+ * titlepage.xsl: Bug fix: make a single author in an authorgroup work correctly
- * graphics.xsl: Fix bug with content-width/content-height vs. width/height in graphics
+2001-06-08 Norman Walsh <nwalsh@users.sourceforge.net>
- * lists.xsl: Improve list formatting; fix bug that caused fo:block to be omitted from list labels sometimes
+ * callout.xsl, inline.xsl, synop.xsl: Fixed some unparameterized references to specific font families
- * pagesetup.xsl: Remove unnecessary rule; put region-after after region-before
+2001-06-04 Norman Walsh <nwalsh@users.sourceforge.net>
- * param.xsl: Added admon.graphics.extension, default.units, and generate.index
+ * block.xsl: Made blockquote indent more reasonable
- * sections.xsl: Keep section titles with next element
+ * graphics.xsl: Omit the url() wrapper around external-graphic srcs for FOP and PT
- * table.xsl: Remove unnecessary doctype declaration
+2001-05-23 Norman Walsh <nwalsh@users.sourceforge.net>
-2001-01-12 Norman Walsh <ndw@nwalsh.com>
+ * graphics.xsl: Fix dup. template bug with is.graphic.*
- * autotoc.xsl: Removed debugging message
+ * titlepage.xsl: Add template for publisher
- * biblio.xsl, component.xsl, division.xsl, glossary.xsl, index.xsl, refentry.xsl, sections.xsl, titlepage.templates.xml, titlepage.templates.xsl, titlepage.xsl:
- Fixed page-master bugs, started to support PassiveTeX bookmarks
+2001-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
- * inline.xsl: Generate proper I18N quote marks
+ * callout.xsl, verbatim.xsl: Move calculation of linenumber.* parameters into the number.rtf.lines template
- * param.xsl: Added passivetex.extensions parameter
+ * titlepage.templates.xml: Reworked titlepage template processing to support use of more interesting
+ predicates.
+
+ Note: in previous versions, at most one title, subtitle, or titleabbrev
+ element would be processed for each title page. In the new design, if you
+ have multiple title, subtitle, or titleabbrev elements inside an info
+ wrapper (you shouldn't!), they will all be processed.
- * table.xsl: Renamed n-rows... and n-columns... properties to number-... in conformance with CR draft
+2001-05-18 Norman Walsh <nwalsh@users.sourceforge.net>
- * verbatim.xsl: Use monospace.font.family parameter, added linefeed-treatment
+ * sections.xsl: Fix subtitle bug
-2001-01-07 Norman Walsh <ndw@nwalsh.com>
+2001-05-12 Norman Walsh <nwalsh@users.sourceforge.net>
- * autotoc.xsl: Format TOCs correctly, use new titlepage style, support LOTs
+ * sections.xsl: Calculate the heading level for bridgeheads
- * component.xsl, division.xsl, sections.xsl, titlepage.templates.xml, titlepage.templates.xsl, titlepage.xsl:
- Extensive changes to better support page layout and title pages
+2001-05-04 Norman Walsh <nwalsh@users.sourceforge.net>
- * docbook.xsl: Remove reference to obsolete file: titlepage.book.xsl
+ * docbook.xsl: Replace hardcoded values on fo:root with parameters
- * footnote.xsl: Cleanup HTMLisms, add font size change
+2001-05-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * pagesetup.xsl: Page setup code
+ * biblio.xsl: Render author names correctly in bibliomixed mode
- * param.xsl: New parameters for page size, font selection, etc.
+ * graphics.xsl: Tweak available graphics formats
- * titlepage.book.xsl: Removed
+ * inline.xsl: Added support for class="xmlpi" and "emptytag".
+ Rendering of attributes is in sync with HTML stylesheet (monospace instead of normal).
- * xref.xsl: Reworked to use modes instead of calling named templates; support xref to author
+ * param.xsl, verbatim.xsl: Created verbatim and monospace.verbatim property sets
-2000-12-14 Norman Walsh <ndw@nwalsh.com>
+ * table.xsl: Process head/body/foot in the right order
- * param.xsl: Fixed documentation typo
+2001-04-26 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-11-29 Norman Walsh <ndw@nwalsh.com>
+ * lists.xsl: Improve procedure step/substep enumeration
- * biblio.xsl, component.xsl, division.xsl, glossary.xsl, index.xsl, pagesetup.xsl, refentry.xsl, sections.xsl:
- Misc. page setup fixes
+2001-04-21 Norman Walsh <nwalsh@users.sourceforge.net>
- * callout.xsl, graphics.xsl, verbatim.xsl: Update support for Saxon6 extensions
+ * qandaset.xsl: My first crude attempts at support for qandaset
- * component.xsl, division.xsl: New page setup code
+2001-04-20 Norman Walsh <nwalsh@users.sourceforge.net>
- * docbook.xsl: New modules; new page setup code
+ * autoidx.xsl: Remove variable references from key functions; use entities instead.
- * math.xsl: Pass MathML through to the backend...
+2001-04-19 Norman Walsh <nwalsh@users.sourceforge.net>
- * pagesetup.xsl: New file.
+ * inline.xsl: Add template for constant
- * param.xsl: Lots of new parameters for page setup
+2001-04-17 Norman Walsh <nwalsh@users.sourceforge.net>
- * pi.xsl: New file.
+ * component.xsl, division.xsl: Add templates for partinfo, chapterinfo, and appendixinfo
- * titlepage.book.xsl: Initial stabs at book titlepages
+ * component.xsl, pagesetup.xsl: Use the new gentext scheme for component titles and running headers
- * xref.xsl: Replace bogus HTML element with an FO
+ * docbook.xsl: Print warning message when an unhandled tag is encountered
-2000-11-17 Norman Walsh <ndw@nwalsh.com>
+ * docbook.xsl, param.xsl: Move label.from.part parameter into param.xsl; default it to 0 so that chapters and appendixes are numbered monotonically throughout a book by default. Moved param.xsl up in the include list, just for good measure
- * block.xsl: Added template for highlights
+2001-04-16 Norman Walsh <nwalsh@users.sourceforge.net>
- * callout.xsl, lists.xsl: Callout list marks didn't work
+ * glossary.xsl: Improve formatting of glossseealso
-2000-11-15 Norman Walsh <ndw@nwalsh.com>
+ * table.xsl: Fix typo: used xsl:param where xsl:variable was required
- * callout.xsl, graphics.xsl, param.xsl, verbatim.xsl: Saxon extension support for callouts and numbered verbatim environments
+2001-04-15 Norman Walsh <nwalsh@users.sourceforge.net>
- * docbook.xsl: Support for rootid
+ * division.xsl: Use new toc/lot parameters
-2000-11-09 Norman Walsh <ndw@nwalsh.com>
+ * docbook.xsl: Removed unused variable declaration
- * glossary.xsl, index.xsl, refentry.xsl: Fixed flow-name (xsl-region-after not xsl-after)
+ * formal.xsl: Fixed typo
-2000-10-29 Norman Walsh <ndw@nwalsh.com>
+ * param.xsl: Added some new parameters
- * xref.xsl: fo:simple-link is now called fo:basic-link
+ * toc.xsl: Support DocBook toc markup
-2000-10-26 Norman Walsh <ndw@nwalsh.com>
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * biblio.xsl: Use attribute sets; fixed missing ID
+ * callout.xsl: Fix bug 412487, make XSL-generated callout marks honor callout mark parameters
- * block.xsl: Use attribute sets
+ * param.xsl: Documentation fixes
- * component.xsl, division.xsl, footnote.xsl, glossary.xsl, index.xsl, sections.xsl:
- Fix footnotes; use fo:footnote FO
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
- * docbook.xsl: Turn off indenting; it breaks verbatim blocks
-
- * fo.xsl, inline.xsl: Support trade, registered, and service dingbats
-
- * formal.xsl: Fix keep error, use attribute sets
-
- * graphics.xsl: Support the @format='linespecific' enbedding hack
-
- * param.xsl: Added several attribute sets; removed check.idref (always check IDREFs)
-
- * titlepage.xsl: Provide fo:table-column info for revision history tables
-
- * verbatim.xsl: Fix white-space property name (white-space-collapse)
-
- * xref.xsl: Update xref support
-
-2000-10-20 Norman Walsh <ndw@nwalsh.com>
-
- * Makefile: Use titlepage.xsl to generate title pages
-
- * titlepage.templates.xsl: Generated from new titlepage.xsl
-
-2000-10-19 Norman Walsh <ndw@nwalsh.com>
-
- * Makefile, component.xsl, docbook.xsl, sections.xsl, titlepage.article.xsl, titlepage.book.xsl, titlepage.part.xsl, titlepage.reference.xsl, titlepage.section.xsl, titlepage.set.xsl, titlepage.templates.xml, titlepage.templates.xsl:
- Converted to template-driven title pages
-
- * lists.xsl, synop.xsl: Added explicit priority to avoid conflict
-
- * param.xsl, table.xsl: Documentation changes
-
-2000-10-17 Norman Walsh <ndw@nwalsh.com>
-
- * param.xsl: Updated documentation; changed variables to parameters
-
- * table.xsl: Updated documentation
-
-2000-10-16 Norman Walsh <ndw@nwalsh.com>
-
- * param.xsl, table.xsl: Added doc:reference
-
-2000-10-14 Norman Walsh <ndw@nwalsh.com>
-
- * graphics.xsl: Rewrote support for graphics
-
-2000-10-12 Norman Walsh <ndw@nwalsh.com>
-
- * sections.xsl: Generate correct page-sequences for documents that begin at the section or sect1 level
-
-2000-10-09 Norman Walsh <ndw@nwalsh.com>
-
- * LostLog, admon.xsl, autotoc.xsl, biblio.xsl, block.xsl, callout.xsl, component.xsl, division.xsl, docbook.xsl, fo.xsl, footnote.xsl, formal.xsl, glossary.xsl, graphics.xsl, index.xsl, info.xsl, inline.xsl, keywords.xsl, lists.xsl, math.xsl, param.xsl, qandaset.xsl, refentry.xsl, sections.xsl, synop.xsl, table.xsl, titlepage.article.xsl, titlepage.book.xsl, titlepage.part.xsl, titlepage.reference.xsl, titlepage.section.xsl, titlepage.set.xsl, titlepage.xsl, toc.xsl, verbatim.xsl, xref.xsl:
+ * .cvsignore, Makefile, admon.xsl, autoidx.xsl, autotoc.xsl, biblio.xsl, block.xsl, callout.xsl, component.xsl, division.xsl, docbook.xsl, fo.xsl, footnote.xsl, fop.xsl, formal.xsl, glossary.xsl, graphics.xsl, index.xsl, info.xsl, inline.xsl, keywords.xsl, lists.xsl, math.xsl, pagesetup.xsl, param.xsl, pi.xsl, qandaset.xsl, refentry.xsl, sections.xsl, synop.xsl, table.xsl, titlepage.templates.xml, titlepage.xsl, toc.xsl, verbatim.xsl, xref.xsl:
New file.
- * component.xsl: Add ID on appendix block
+ * Makefile: Use the cvstools version of saxon
diff --git a/tests/docbook/fo/admon.xsl b/tests/docbook/fo/admon.xsl
index 7554bc6a..6280ff8a 100644
--- a/tests/docbook/fo/admon.xsl
+++ b/tests/docbook/fo/admon.xsl
@@ -26,7 +26,7 @@
<xsl:template name="admon.graphic.width">
<xsl:param name="node" select="."/>
- <xsl:text>25</xsl:text>
+ <xsl:text>36pt</xsl:text>
</xsl:template>
<xsl:template name="admon.graphic">
@@ -44,7 +44,11 @@
</xsl:template>
<xsl:template name="graphical.admonition">
- <fo:block>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fo:block id="{$id}">
<fo:table>
<fo:table-body>
<fo:table-row>
@@ -62,15 +66,7 @@
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title"
- mode="admonition.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -87,21 +83,19 @@
</xsl:template>
<xsl:template name="nongraphical.admonition">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
<fo:block space-before.minimum="0.8em"
space-before.optimum="1em"
space-before.maximum="1.2em"
start-indent="0.25in"
- end-indent="0.25in">
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title" mode="admonition.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <fo:block font-size="14pt" font-weight="bold" keep-with-next='true'>
- <xsl:call-template name="gentext.element.name"/>
- </fo:block>
- </xsl:otherwise>
- </xsl:choose>
+ end-indent="0.25in"
+ id="{$id}">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next='always'>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </fo:block>
<xsl:apply-templates/>
</fo:block>
@@ -114,7 +108,7 @@
<xsl:template match="tip/title"></xsl:template>
<xsl:template match="title" mode="admonition.title.mode">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next='true'>
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next='always'>
<xsl:apply-templates/>
</fo:block>
</xsl:template>
diff --git a/tests/docbook/fo/autoidx.xsl b/tests/docbook/fo/autoidx.xsl
new file mode 100644
index 00000000..9a998cc1
--- /dev/null
+++ b/tests/docbook/fo/autoidx.xsl
@@ -0,0 +1,332 @@
+<?xml version="1.0"?>
+<!DOCTYPE xsl:stylesheet [
+
+<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
+<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
+
+<!ENTITY primary 'concat(primary/@sortas, primary[not(@sortas)])'>
+<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
+<!ENTITY tertiary 'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
+
+<!ENTITY section '(ancestor-or-self::set
+ |ancestor-or-self::book
+ |ancestor-or-self::part
+ |ancestor-or-self::reference
+ |ancestor-or-self::partintro
+ |ancestor-or-self::chapter
+ |ancestor-or-self::appendix
+ |ancestor-or-self::preface
+ |ancestor-or-self::section
+ |ancestor-or-self::sect1
+ |ancestor-or-self::sect2
+ |ancestor-or-self::sect3
+ |ancestor-or-self::sect4
+ |ancestor-or-self::sect5
+ |ancestor-or-self::refsect1
+ |ancestor-or-self::refsect2
+ |ancestor-or-self::refsect3
+ |ancestor-or-self::simplesect
+ |ancestor-or-self::bibliography
+ |ancestor-or-self::glossary
+ |ancestor-or-self::index)[last()]'>
+
+<!ENTITY section.id 'generate-id(&section;)'>
+<!ENTITY sep '" "'>
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ version="1.0">
+
+<xsl:import href="docbook.xsl"/>
+
+<!-- ==================================================================== -->
+<!-- Derived from Jeni Tennison's work in the HTML case -->
+
+<xsl:key name="letter"
+ match="indexterm"
+ use="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
+
+<xsl:key name="primary"
+ match="indexterm"
+ use="&primary;"/>
+
+<xsl:key name="secondary"
+ match="indexterm"
+ use="concat(&primary;, &sep;, &secondary;)"/>
+
+<xsl:key name="tertiary"
+ match="indexterm"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
+
+<xsl:key name="primary-section"
+ match="indexterm[not(secondary) and not(see)]"
+ use="concat(&primary;, &sep;, &section.id;)"/>
+
+<xsl:key name="secondary-section"
+ match="indexterm[not(tertiary) and not(see)]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &section.id;)"/>
+
+<xsl:key name="tertiary-section"
+ match="indexterm[not(see)]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, &section.id;)"/>
+
+<xsl:key name="see-also"
+ match="indexterm[seealso]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso)"/>
+
+<xsl:key name="see"
+ match="indexterm[see]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/>
+
+<xsl:key name="sections" match="*[@id]" use="@id"/>
+
+<xsl:template name="generate-index">
+ <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
+ translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"/>
+ <xsl:variable name="alphabetical"
+ select="$terms[contains(concat(&lowercase;, &uppercase;),
+ substring(&primary;, 1, 1))]"/>
+ <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
+ &uppercase;),
+ substring(&primary;, 1, 1)))]"/>
+ <fo:block>
+ <xsl:if test="$others">
+ <fo:block font-size="16pt"
+ font-weight="bold"
+ keep-with-next.within-column="always"
+ space-before="1em">
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'index symbols'"/>
+ </xsl:call-template>
+ </fo:block>
+ <fo:block>
+ <xsl:apply-templates select="$others[count(.|key('primary',
+ &primary;)[1]) = 1]"
+ mode="index-primary">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </fo:block>
+ </xsl:if>
+ <xsl:apply-templates select="$alphabetical[count(.|key('letter',
+ translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"
+ mode="index-div">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-div">
+ <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
+ <fo:block>
+ <!-- this isn't quite exactly right. ideally all the symbols would -->
+ <!-- be grouped together. as it stands, they all get separate divs -->
+ <!-- but at least this test makes sure that they don't all get -->
+ <!-- separate titles as well. -->
+ <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
+ <fo:block font-size="16pt"
+ font-weight="bold"
+ keep-with-next.within-column="always"
+ space-before="1em">
+ <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
+ </fo:block>
+ </xsl:if>
+ <fo:block>
+ <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[1]) = 1]"
+ mode="index-primary">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </fo:block>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-primary">
+ <xsl:variable name="key" select="&primary;"/>
+ <xsl:variable name="refs" select="key('primary', $key)"/>
+ <fo:block>
+ <xsl:value-of select="primary"/>
+
+ <xsl:variable name="page-number-citations">
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != '0'">
+ <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
+ <xsl:copy-of select="$page-number-citations"/>
+ </fotex:sort>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="$page-number-citations"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:block>
+ <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
+ <fo:block start-indent="1pc">
+ <fo:block>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[1]) = 1]"
+ mode="index-secondary">
+ <xsl:sort select="&secondary;"/>
+ </xsl:apply-templates>
+ </fo:block>
+ </fo:block>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-secondary">
+ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
+ <xsl:variable name="refs" select="key('secondary', $key)"/>
+ <fo:block>
+ <xsl:value-of select="secondary"/>
+
+ <xsl:variable name="page-number-citations">
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != '0'">
+ <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
+ <xsl:copy-of select="$page-number-citations"/>
+ </fotex:sort>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="$page-number-citations"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:block>
+ <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
+ <fo:block start-indent="2pc">
+ <fo:block>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[1]) = 1]"
+ mode="index-tertiary">
+ <xsl:sort select="&tertiary;"/>
+ </xsl:apply-templates>
+ </fo:block>
+ </fo:block>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-tertiary">
+ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
+ <xsl:variable name="refs" select="key('tertiary', $key)"/>
+ <fo:block>
+ <xsl:value-of select="tertiary"/>
+
+ <xsl:variable name="page-number-citations">
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != '0'">
+ <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
+ <xsl:copy-of select="$page-number-citations"/>
+ </fotex:sort>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="$page-number-citations"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:block>
+ <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
+ <xsl:if test="$see">
+ <fo:block>
+ <fo:block>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ </fo:block>
+ </fo:block>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="reference">
+ <xsl:if test="$passivetex.extensions = '0'">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="@zone and string(@zone)">
+ <xsl:call-template name="reference">
+ <xsl:with-param name="zones" select="normalize-space(@zone)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+ <fo:page-number-citation ref-id="{$id}"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="reference">
+ <xsl:param name="zones"/>
+ <xsl:choose>
+ <xsl:when test="contains($zones, ' ')">
+ <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
+ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$target[1]"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <fo:page-number-citation ref-id="{$id}"/>
+
+ <xsl:if test="$passivetex.extensions = '0'">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+ <xsl:call-template name="reference">
+ <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="zone" select="$zones"/>
+ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$target[1]"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <fo:page-number-citation ref-id="{$id}"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-see">
+ <fo:block><xsl:value-of select="see"/></fo:block>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-seealso">
+ <fo:block><xsl:value-of select="seealso"/></fo:block>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/fo/autotoc.xsl b/tests/docbook/fo/autotoc.xsl
index 666c7a51..ac5c526d 100644
--- a/tests/docbook/fo/autotoc.xsl
+++ b/tests/docbook/fo/autotoc.xsl
@@ -13,13 +13,16 @@
******************************************************************** -->
+<!-- ==================================================================== -->
+
<xsl:template name="division.toc">
<xsl:variable name="nodes"
select="part|reference|preface
|chapter|appendix
+ |article
|bibliography|glossary|index"/>
<xsl:if test="$nodes">
- <fo:block>
+ <fo:block xsl:use-attribute-sets="toc.margin.properties">
<xsl:call-template name="table.of.contents.titlepage"/>
<xsl:apply-templates select="$nodes" mode="toc"/>
</fo:block>
@@ -27,13 +30,15 @@
</xsl:template>
<xsl:template name="component.toc">
- <xsl:variable name="nodes" select="section|sect1"/>
+ <xsl:variable name="nodes" select="section|sect1|refentry
+ |article|bibliography|glossary
+ |appendix"/>
<xsl:if test="$nodes">
- <fo:block>
+ <fo:block xsl:use-attribute-sets="toc.margin.properties">
<fo:block>
<fo:inline font-weight="bold">
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">TableofContents</xsl:with-param>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">TableofContents</xsl:with-param>
</xsl:call-template>
</fo:inline>
</fo:block>
@@ -42,20 +47,41 @@
</xsl:if>
</xsl:template>
-<xsl:template match="part" mode="toc">
+<!-- ==================================================================== -->
+
+<xsl:template name="toc.line">
<xsl:variable name="id">
<xsl:call-template name="object.id"/>
</xsl:variable>
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
+ <fo:block text-align-last="justify"
+ end-indent="2pc"
+ last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fo:inline>
+ <fo:inline keep-together.within-line="always">
+ <xsl:text> </xsl:text>
+ <fo:leader leader-pattern="dots"
+ keep-with-next.within-line="always"/>
+ <xsl:text> </xsl:text>
+ <fo:basic-link internal-destination="{$id}">
+<!-- xsl:use-attribute-sets="xref.properties">-->
+ <fo:page-number-citation ref-id="{$id}"/>
+ </fo:basic-link>
+ </fo:inline>
</fo:block>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="part" mode="toc">
+ <xsl:call-template name="toc.line"/>
<xsl:if test="chapter|appendix|preface|reference">
- <fo:block start-indent="2pc">
+ <fo:block start-indent="{count(ancestor::*)*2}pc">
<xsl:apply-templates select="chapter|appendix|preface|reference"
mode="toc"/>
</fo:block>
@@ -63,39 +89,25 @@
</xsl:template>
<xsl:template match="reference" mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+ <xsl:call-template name="toc.line"/>
<xsl:if test="refentry">
- <fo:block start-indent="2pc">
+ <fo:block start-indent="{count(ancestor::*)*2}pc">
<xsl:apply-templates select="refentry" mode="toc"/>
</fo:block>
</xsl:if>
</xsl:template>
-<xsl:template match="preface|chapter|appendix"
- mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
+<xsl:template match="refentry" mode="toc">
+ <xsl:call-template name="toc.line"/>
+</xsl:template>
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+<xsl:template match="preface|chapter|appendix|article"
+ mode="toc">
+ <xsl:call-template name="toc.line"/>
<xsl:if test="section|sect1">
- <fo:block start-indent="2pc">
+ <fo:block start-indent="{count(ancestor::*)*2}pc">
<xsl:apply-templates select="section|sect1"
mode="toc"/>
</fo:block>
@@ -104,19 +116,10 @@
<xsl:template match="section|sect1|sect2|sect3|sect4|sect5"
mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+ <xsl:call-template name="toc.line"/>
<xsl:if test="section|sect2|sect3|sect4|sect5">
- <fo:block start-indent="2pc">
+ <fo:block start-indent="{count(ancestor::*)*2}pc">
<xsl:apply-templates select="section|sect2|sect3|sect4|sect5"
mode="toc"/>
</fo:block>
@@ -125,31 +128,13 @@
<xsl:template match="bibliography|glossary"
mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+ <xsl:call-template name="toc.line"/>
</xsl:template>
<xsl:template match="index"
mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
<xsl:if test="* or $generate.index">
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+ <xsl:call-template name="toc.line"/>
</xsl:if>
</xsl:template>
@@ -188,16 +173,7 @@
</xsl:template>
<xsl:template match="figure|table|example|equation" mode="toc">
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
- <fo:block>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:apply-templates select="." mode="title.content"/>
- <fo:leader leader-pattern="dots" text-align-last="justify"/>
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:block>
+ <xsl:call-template name="toc.line"/>
</xsl:template>
<!-- ==================================================================== -->
diff --git a/tests/docbook/fo/biblio.xsl b/tests/docbook/fo/biblio.xsl
index a6fecc3c..cea657e7 100644
--- a/tests/docbook/fo/biblio.xsl
+++ b/tests/docbook/fo/biblio.xsl
@@ -65,7 +65,7 @@
<xsl:template match="bibliography/titleabbrev"></xsl:template>
<xsl:template match="bibliography/title" mode="component.title.mode">
- <fo:block xsl:use-attribute-sets="component.title.attrs">
+ <fo:block xsl:use-attribute-sets="component.title.properties">
<xsl:apply-templates/>
</fo:block>
</xsl:template>
@@ -99,7 +99,7 @@
<xsl:template match="biblioentry">
<xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
- <fo:block id="{$id}">
+ <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing">
<xsl:apply-templates mode="bibliography.mode"/>
</fo:block>
</xsl:template>
@@ -303,7 +303,9 @@
<xsl:template match="copyright" mode="bibliography.mode">
<fo:inline>
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Copyright'"/>
+ </xsl:call-template>
<xsl:call-template name="gentext.space"/>
<xsl:call-template name="dingbat">
<xsl:with-param name="dingbat">copyright</xsl:with-param>
@@ -563,6 +565,48 @@
</fo:inline>
</xsl:template>
+<xsl:template match="orgdiv" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
+<xsl:template match="collabname" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
+<xsl:template match="confdates" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
+<xsl:template match="conftitle" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
+<xsl:template match="confnum" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
+<xsl:template match="confsponsor" mode="bibliography.mode">
+ <fo:inline>
+ <xsl:apply-templates mode="bibliography.mode"/>
+ <xsl:value-of select="$biblioentry.item.separator"/>
+ </fo:inline>
+</xsl:template>
+
<!-- ==================================================================== -->
<xsl:template match="*" mode="bibliomixed.mode">
@@ -613,7 +657,7 @@
<xsl:template match="author" mode="bibliomixed.mode">
<fo:inline>
- <xsl:apply-templates mode="bibliomixed.mode"/>
+ <xsl:call-template name="person.name"/>
</fo:inline>
</xsl:template>
diff --git a/tests/docbook/fo/block.xsl b/tests/docbook/fo/block.xsl
index 61e37ca4..589fab45 100644
--- a/tests/docbook/fo/block.xsl
+++ b/tests/docbook/fo/block.xsl
@@ -42,7 +42,9 @@
</xsl:template>
<xsl:template match="formalpara/title">
- <fo:inline font-weight="bold">
+ <fo:inline font-weight="bold"
+ keep-with-next.within-line="always"
+ padding-end="1em">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
@@ -54,7 +56,7 @@
<!-- ==================================================================== -->
<xsl:template match="blockquote">
- <fo:block start-indent="1in" end-indent="1in">
+ <fo:block start-indent="0.5in" end-indent="0.5in">
<xsl:call-template name="semiformal.object"/>
</fo:block>
</xsl:template>
@@ -78,11 +80,13 @@
<xsl:template match="sidebar">
<fo:block>
<xsl:if test="./title">
- <fo:block font-weight="bold">
+ <fo:block font-weight="bold"
+ keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:apply-templates select="./title" mode="sidebar.title.mode"/>
</fo:block>
</xsl:if>
-
+
<xsl:apply-templates/>
</fo:block>
</xsl:template>
@@ -96,6 +100,25 @@
<!-- ==================================================================== -->
+<xsl:template match="abstract">
+ <fo:block>
+ <xsl:if test="@id">
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ </xsl:if>
+ <xsl:call-template name="formal.object.heading">
+ <xsl:with-param name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ <xsl:apply-templates/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="abstract/title">
+</xsl:template>
+
+<!-- ==================================================================== -->
+
<xsl:template match="msgset">
<xsl:apply-templates/>
</xsl:template>
@@ -117,6 +140,7 @@
</xsl:template>
<xsl:template match="msgrel">
+ <xsl:apply-templates/>
</xsl:template>
<xsl:template match="msgtext">
@@ -127,11 +151,40 @@
<xsl:call-template name="block.object"/>
</xsl:template>
-<xsl:template match="msglevel|msgorig|msgaud">
+<xsl:template match="msglevel">
+ <fo:block>
+ <fo:inline font-weight="bold"
+ keep-with-next.within-line="always">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgLevel'"/>
+ </xsl:call-template>
+ </fo:inline>
+ <xsl:apply-templates/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="msgorig">
<fo:block>
- <fo:inline font-weight="bold">
- <xsl:call-template name="gentext.element.name"/>
- <xsl:text>: </xsl:text>
+ <fo:inline font-weight="bold"
+ keep-with-next.within-line="always">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgOrig'"/>
+ </xsl:call-template>
+ </fo:inline>
+ <xsl:apply-templates/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="msgaud">
+ <fo:block>
+ <fo:inline font-weight="bold"
+ keep-with-next.within-line="always">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgAud'"/>
+ </xsl:call-template>
</fo:inline>
<xsl:apply-templates/>
</fo:block>
@@ -142,7 +195,11 @@
</xsl:template>
<xsl:template match="msgexplan/title">
- <fo:block font-weight="bold"><xsl:apply-templates/></fo:block>
+ <fo:block font-weight="bold"
+ keep-with-next.within-column="always"
+ hyphenate="false">
+ <xsl:apply-templates/>
+ </fo:block>
</xsl:template>
<!-- ==================================================================== -->
diff --git a/tests/docbook/fo/callout.xsl b/tests/docbook/fo/callout.xsl
index 34318dc5..ef456ff6 100644
--- a/tests/docbook/fo/callout.xsl
+++ b/tests/docbook/fo/callout.xsl
@@ -1,9 +1,10 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:verb5="http://nwalsh.com/com.nwalsh.saxon.Verbatim"
- xmlns:verb6="http://nwalsh.com/com.nwalsh.saxon6.Verbatim"
- exclude-result-prefixes="verb5 verb6"
+ xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
+ xmlns:xverb="com.nwalsh.xalan.Verbatim"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="sverb xverb lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -16,53 +17,47 @@
******************************************************************** -->
+<lxslt:component prefix="xverb"
+ functions="insertCallouts"/>
+
<xsl:template match="programlistingco|screenco">
<xsl:variable name="verbatim" select="programlisting|screen"/>
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.callouts != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $callouts.extension != '0'">
<xsl:variable name="rtf">
<xsl:apply-templates select="$verbatim">
<xsl:with-param name="suppress-numbers" select="'1'"/>
</xsl:apply-templates>
</xsl:variable>
+
<xsl:variable name="rtf-with-callouts">
<xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:insertCallouts(areaspec,$rtf)"/>
+ <xsl:when test="contains($vendor, 'SAXON ')">
+ <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
</xsl:when>
- <xsl:when test="$callout.graphics != 0">
- <xsl:copy-of select="verb5:insertCallouts(areaspec,$rtf,
- $callout.defaultcolumn,
- $callout.graphics.path,
- $callout.graphics.extension,
- $callout.graphics.number.limit,
- false())"/>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="verb5:insertCallouts(areaspec,$rtf,
- $callout.defaultcolumn)"/>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do callouts with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose>
<xsl:when test="$verbatim/@linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf-with-callouts)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf-with-callouts,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ and $linenumbering.extension != '0'">
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
+ <xsl:with-param name="pi.context"
+ select="programlisting|screen"/>
+ </xsl:call-template>
<xsl:apply-templates select="calloutlist"/>
</xsl:when>
<xsl:otherwise>
@@ -88,6 +83,12 @@
<xsl:number count="area|areaset" format="1"/>
</xsl:template>
+<xsl:template match="co">
+ <fo:inline id="{@id}">
+ <xsl:apply-templates select="." mode="callout-bug"/>
+ </fo:inline>
+</xsl:template>
+
<xsl:template match="co" mode="callout-bug">
<xsl:call-template name="callout-bug">
<xsl:with-param name="conum">
@@ -100,16 +101,90 @@
<xsl:param name="conum" select='1'/>
<xsl:choose>
- <xsl:when test="$callout.graphics = '0'
- or $conum > $callout.graphics.number.limit">
+ <!-- Draw callouts as images -->
+ <xsl:when test="$callout.graphics != '0'
+ and $conum &lt;= $callout.graphics.number.limit">
+ <fo:external-graphic
+ src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"/>
+ </xsl:when>
+
+ <xsl:when test="$callout.unicode != 0
+ and $conum &lt;= $callout.unicode.number.limit">
+ <xsl:choose>
+ <xsl:when test="$callout.unicode.start.character = 10102">
+ <xsl:choose>
+ <xsl:when test="$conum = 1">&#10102;</xsl:when>
+ <xsl:when test="$conum = 2">&#10103;</xsl:when>
+ <xsl:when test="$conum = 3">&#10104;</xsl:when>
+ <xsl:when test="$conum = 4">&#10105;</xsl:when>
+ <xsl:when test="$conum = 5">&#10106;</xsl:when>
+ <xsl:when test="$conum = 6">&#10107;</xsl:when>
+ <xsl:when test="$conum = 7">&#10108;</xsl:when>
+ <xsl:when test="$conum = 8">&#10109;</xsl:when>
+ <xsl:when test="$conum = 9">&#10110;</xsl:when>
+ <xsl:when test="$conum = 10">&#10111;</xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
+ <xsl:text>when $callout.unicode.start.character is </xsl:text>
+ <xsl:value-of select="$callout.unicode.start.character"/>
+ </xsl:message>
+ <fo:inline background-color="#404040"
+ color="white"
+ padding-top="0.1em"
+ padding-bottom="0.1em"
+ padding-start="0.2em"
+ padding-end="0.2em"
+ baseline-shift="0.1em"
+ font-family="{$body.font.family}"
+ font-weight="bold"
+ font-size="75%">
+ <xsl:value-of select="$conum"/>
+ </fo:inline>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
- <xsl:text>(</xsl:text>
- <xsl:value-of select="$conum"/>
- <xsl:text>)</xsl:text>
+ <!-- Pick callouts from Zapf Dingbats - max 10 -->
+ <xsl:when test="$callout.dingbats != '0' and $conum &lt;= 10">
+ <fo:inline font-family="ZapfDingbats">
+ <xsl:choose>
+ <xsl:when test="$conum=1">&#x2776;</xsl:when>
+ <xsl:when test="$conum=2">&#x2777;</xsl:when>
+ <xsl:when test="$conum=3">&#x2778;</xsl:when>
+ <xsl:when test="$conum=4">&#x2779;</xsl:when>
+ <xsl:when test="$conum=5">&#x277A;</xsl:when>
+ <xsl:when test="$conum=6">&#x277B;</xsl:when>
+ <xsl:when test="$conum=7">&#x277C;</xsl:when>
+ <xsl:when test="$conum=8">&#x277D;</xsl:when>
+ <xsl:when test="$conum=9">&#x277E;</xsl:when>
+ <xsl:when test="$conum=10">&#x277F;</xsl:when>
+ <xsl:otherwise><!-- overflow -->
+ <xsl:attribute name="color">red</xsl:attribute>
+ <xsl:text>&#x25CF;</xsl:text>
+ <xsl:message>
+ <xsl:text>A callout list contains more than 10 callouts;</xsl:text>
+ <xsl:text> callout numbering truncated.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:inline>
</xsl:when>
+
+ <!-- Most safe: draw a dark gray square with a white number inside -->
<xsl:otherwise>
- <fo:external-graphic
- src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"/>
+ <fo:inline background-color="#404040"
+ color="white"
+ padding-top="0.1em"
+ padding-bottom="0.1em"
+ padding-start="0.2em"
+ padding-end="0.2em"
+ baseline-shift="0.1em"
+ font-family="{$body.font.family}"
+ font-weight="bold"
+ font-size="75%"><xsl:value-of select="$conum"/></fo:inline>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
diff --git a/tests/docbook/fo/component.xsl b/tests/docbook/fo/component.xsl
index 155f3aa5..2ae88c35 100644
--- a/tests/docbook/fo/component.xsl
+++ b/tests/docbook/fo/component.xsl
@@ -23,7 +23,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="title">
- <xsl:apply-templates select="$node" mode="title.ref"/>
+ <xsl:apply-templates select="$node" mode="object.title.markup"/>
</xsl:variable>
<xsl:if test="$passivetex.extensions != 0">
@@ -34,7 +34,8 @@
</fotex:bookmark>
</xsl:if>
- <fo:block>
+ <fo:block keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:copy-of select="$title"/>
</fo:block>
</xsl:template>
@@ -42,11 +43,15 @@
<xsl:template name="component.subtitle">
<xsl:param name="node" select="."/>
<xsl:variable name="subtitle">
- <xsl:apply-templates select="$node" mode="subtitle.content"/>
+ <xsl:apply-templates select="$node" mode="subtitle.markup"/>
</xsl:variable>
<xsl:if test="$subtitle != ''">
- <fo:block font-size="16pt" font-weight="bold" font-style="italic">
+ <fo:block font-size="16pt"
+ font-weight="bold"
+ font-style="italic"
+ keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:copy-of select="$subtitle"/>
</fo:block>
</xsl:if>
@@ -179,7 +184,7 @@
</fo:page-sequence>
</xsl:template>
-<xsl:template match="chapter/docinfo"></xsl:template>
+<xsl:template match="chapter/docinfo|chapterinfo"></xsl:template>
<xsl:template match="chapter/title"></xsl:template>
<xsl:template match="chapter/titleabbrev"></xsl:template>
<xsl:template match="chapter/subtitle"></xsl:template>
@@ -220,7 +225,7 @@
</fo:page-sequence>
</xsl:template>
-<xsl:template match="appendix/docinfo"></xsl:template>
+<xsl:template match="appendix/docinfo|appendixinfo"></xsl:template>
<xsl:template match="appendix/title"></xsl:template>
<xsl:template match="appendix/titleabbrev"></xsl:template>
<xsl:template match="appendix/subtitle"></xsl:template>
@@ -342,7 +347,7 @@
<xsl:call-template name="section.heading">
<xsl:with-param name="level" select="2"/>
<xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
diff --git a/tests/docbook/fo/division.xsl b/tests/docbook/fo/division.xsl
index 11509e8c..907a2280 100644
--- a/tests/docbook/fo/division.xsl
+++ b/tests/docbook/fo/division.xsl
@@ -23,7 +23,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="title">
- <xsl:apply-templates select="$node" mode="title.ref"/>
+ <xsl:apply-templates select="$node" mode="title.markup"/>
</xsl:variable>
<xsl:if test="$passivetex.extensions != 0">
@@ -34,7 +34,8 @@
</fotex:bookmark>
</xsl:if>
- <fo:block>
+ <fo:block keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:copy-of select="$title"/>
</fo:block>
</xsl:template>
@@ -122,7 +123,7 @@
</fo:page-sequence>
</xsl:if>
- <xsl:if test="$generate.division.toc != '0'">
+ <xsl:if test="$generate.book.toc != '0'">
<fo:page-sequence hyphenate="{$hyphenate}"
format="i"
master-name="{$master-name}">
@@ -145,7 +146,7 @@
</fo:page-sequence>
</xsl:if>
- <xsl:if test="$generate.division.figure.lot != '0' and .//figure">
+ <xsl:if test="$generate.book.figure.lot != '0' and .//figure">
<fo:page-sequence hyphenate="{$hyphenate}"
format="i"
master-name="{$master-name}">
@@ -171,7 +172,7 @@
</fo:page-sequence>
</xsl:if>
- <xsl:if test="$generate.division.table.lot != '0' and .//table">
+ <xsl:if test="$generate.book.table.lot != '0' and .//table">
<fo:page-sequence hyphenate="{$hyphenate}"
format="i"
master-name="{$master-name}">
@@ -197,7 +198,7 @@
</fo:page-sequence>
</xsl:if>
- <xsl:if test="$generate.division.example.lot != '0' and .//example">
+ <xsl:if test="$generate.book.example.lot != '0' and .//example">
<fo:page-sequence hyphenate="{$hyphenate}"
format="i"
master-name="{$master-name}">
@@ -223,7 +224,7 @@
</fo:page-sequence>
</xsl:if>
- <xsl:if test="$generate.division.equation.lot != '0' and .//equation">
+ <xsl:if test="$generate.book.equation.lot != '0' and .//equation">
<fo:page-sequence hyphenate="{$hyphenate}"
format="i"
master-name="{$master-name}">
@@ -299,7 +300,7 @@
<xsl:call-template name="part.titlepage"/>
</xsl:template>
-<xsl:template match="part/docinfo"></xsl:template>
+<xsl:template match="part/docinfo|partinfo"></xsl:template>
<xsl:template match="part/title"></xsl:template>
<xsl:template match="part/subtitle"></xsl:template>
diff --git a/tests/docbook/fo/docbook.xsl b/tests/docbook/fo/docbook.xsl
index 51b8d77e..7f081a63 100644
--- a/tests/docbook/fo/docbook.xsl
+++ b/tests/docbook/fo/docbook.xsl
@@ -21,10 +21,14 @@
<!-- ==================================================================== -->
<xsl:include href="../VERSION"/>
+<xsl:include href="param.xsl"/>
<xsl:include href="../lib/lib.xsl"/>
<xsl:include href="../common/l10n.xsl"/>
<xsl:include href="../common/common.xsl"/>
-<xsl:include href="param.xsl"/>
+<xsl:include href="../common/labels.xsl"/>
+<xsl:include href="../common/titles.xsl"/>
+<xsl:include href="../common/subtitles.xsl"/>
+<xsl:include href="../common/gentext.xsl"/>
<xsl:include href="autotoc.xsl"/>
<xsl:include href="lists.xsl"/>
<xsl:include href="callout.xsl"/>
@@ -56,9 +60,15 @@
<xsl:include href="pagesetup.xsl"/>
<xsl:include href="pi.xsl"/>
+<xsl:include href="fop.xsl"/>
+
<!-- ==================================================================== -->
<xsl:template match="*">
+ <xsl:message>
+ <xsl:value-of select="name(.)"/>
+ <xsl:text> encountered, but no template matches.</xsl:text>
+ </xsl:message>
<fo:block color="red">
<xsl:text>&lt;</xsl:text>
<xsl:value-of select="name(.)"/>
@@ -96,15 +106,10 @@
<xsl:otherwise>[could not find document title]</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="docinfo"
- select="*[1]/artheader
- |*[1]/articleinfo
- |*[1]/sectioninfo
- |*[1]/sect1info"/>
-
- <fo:root font-family="Times Roman"
- font-size="12pt"
- text-align="justify">
+
+ <fo:root font-family="{$body.font.family}"
+ font-size="{$body.font.size}"
+ text-align="{$alignment}">
<xsl:call-template name="setup.pagemasters"/>
<xsl:choose>
<xsl:when test="$rootid != ''">
@@ -117,11 +122,17 @@
</xsl:message>
</xsl:when>
<xsl:otherwise>
+ <xsl:if test="$fop.extensions != 0">
+ <xsl:apply-templates select="id($rootid)" mode="outline"/>
+ </xsl:if>
<xsl:apply-templates select="id($rootid)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
+ <xsl:if test="$fop.extensions != 0">
+ <xsl:apply-templates mode="outline"/>
+ </xsl:if>
<xsl:apply-templates/>
</xsl:otherwise>
</xsl:choose>
diff --git a/tests/docbook/fo/footnote.xsl b/tests/docbook/fo/footnote.xsl
index 42432e08..014f34ef 100644
--- a/tests/docbook/fo/footnote.xsl
+++ b/tests/docbook/fo/footnote.xsl
@@ -41,7 +41,10 @@
<!-- ==================================================================== -->
-<xsl:template match="footnote/para[1]">
+<xsl:template match="footnote/para[1]
+ |footnote/simpara[1]
+ |footnote/formalpara[1]"
+ priority="2">
<!-- this only works if the first thing in a footnote is a para, -->
<!-- which is ok, because it usually is. -->
<fo:block>
diff --git a/tests/docbook/fo/fop.xsl b/tests/docbook/fo/fop.xsl
new file mode 100644
index 00000000..9fb64c5a
--- /dev/null
+++ b/tests/docbook/fo/fop.xsl
@@ -0,0 +1,126 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:fox="http://xml.apache.org/fop/extensions"
+ version='1.0'>
+
+<!-- ********************************************************************
+ $Id$
+ ********************************************************************
+ (c) Stephane Bline Peregrine Systems 2001
+ Driver file to allow pdf bookmarking (based on fop implementation).
+ ******************************************************************** -->
+
+<xsl:template match="set" mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+
+ <xsl:if test="book">
+ <xsl:apply-templates select="book"
+ mode="outline"/>
+ </xsl:if>
+ </fox:outline>
+</xsl:template>
+
+<xsl:template match="book" mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+
+ <xsl:if test="part|preface|chapter|appendix">
+ <xsl:apply-templates select="part|preface|chapter|appendix"
+ mode="outline"/>
+ </xsl:if>
+ </fox:outline>
+</xsl:template>
+
+
+<xsl:template match="part" mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+
+ <xsl:if test="chapter|appendix|preface|reference">
+ <xsl:apply-templates select="chapter|appendix|preface|reference"
+ mode="outline"/>
+ </xsl:if>
+ </fox:outline>
+</xsl:template>
+
+<xsl:template match="preface|chapter|appendix"
+ mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+
+ <xsl:if test="section|sect1">
+ <xsl:apply-templates select="section|sect1"
+ mode="outline"/>
+ </xsl:if>
+ </fox:outline>
+</xsl:template>
+
+<xsl:template match="section|sect1|sect2|sect3|sect4|sect5"
+ mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+
+ <xsl:if test="section|sect2|sect3|sect4|sect5">
+ <xsl:apply-templates select="section|sect2|sect3|sect4|sect5"
+ mode="outline"/>
+ </xsl:if>
+ </fox:outline>
+</xsl:template>
+
+<xsl:template match="bibliography|glossary|index"
+ mode="outline">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fox:outline internal-destination="{$id}">
+ <fox:label>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </fox:label>
+ </fox:outline>
+</xsl:template>
+
+<xsl:template match="title" mode="outline">
+ <xsl:apply-templates/>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/tests/docbook/fo/formal.xsl b/tests/docbook/fo/formal.xsl
index 183f0cf2..4d73ffb3 100644
--- a/tests/docbook/fo/formal.xsl
+++ b/tests/docbook/fo/formal.xsl
@@ -14,15 +14,21 @@
******************************************************************** -->
<xsl:template name="formal.object">
- <fo:block keep-with-next.within-column="always">
- <xsl:attribute name="id">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- </fo:block>
- <fo:block keep-with-previous.within-column="always">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fo:block id="{$id}"
+ 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">
<xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates/>
@@ -31,7 +37,7 @@
<xsl:template name="formal.object.heading">
<xsl:param name="title"></xsl:param>
- <fo:block xsl:use-attribute-sets="formal.title.attrs">
+ <fo:block xsl:use-attribute-sets="formal.title.properties">
<xsl:copy-of select="$title"/>
</fo:block>
</xsl:template>
@@ -64,10 +70,22 @@
<xsl:variable name="prop-columns"
select=".//colspec[contains(@colwidth, '*')]"/>
- <fo:table-and-caption id="{$id}" keep-together.within-column="always">
+ <fo:table-and-caption id="{$id}"
+ keep-together.within-column="always"
+ space-before.minimum="0.8em"
+ space-before.optimum="1em"
+ space-before.maximum="1.2em"
+ space-after.minimum="0.8em"
+ space-after.optimum="1em"
+ space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight='bold'>
- <xsl:apply-templates select="." mode="title.ref"/>
+ <fo:block font-weight='bold'
+ space-after.minimum="0.2em"
+ space-after.optimum="0.5em"
+ space-after.maximum="0.8em"
+ keep-with-next.within-column="always"
+ hyphenate="false">
+ <xsl:apply-templates select="." mode="title.markup"/>
</fo:block>
</fo:table-caption>
<fo:table>
diff --git a/tests/docbook/fo/glossary.xsl b/tests/docbook/fo/glossary.xsl
index 665ea47f..71becc22 100644
--- a/tests/docbook/fo/glossary.xsl
+++ b/tests/docbook/fo/glossary.xsl
@@ -118,13 +118,20 @@
<xsl:template match="glossary/titleabbrev"></xsl:template>
<xsl:template match="glossary/title" mode="component.title.mode">
- <fo:block font-size="18pt" font-weight="bold">
+ <fo:block font-size="18pt"
+ font-weight="bold"
+ keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:apply-templates/>
</fo:block>
</xsl:template>
<xsl:template match="glossary/subtitle" mode="component.title.mode">
- <fo:block font-size="16pt" font-weight="bold" font-style="italic">
+ <fo:block font-size="16pt"
+ font-weight="bold"
+ font-style="italic"
+ keep-with-next.within-column="always"
+ hyphenate="false">
<xsl:apply-templates/>
</fo:block>
</xsl:template>
@@ -174,13 +181,18 @@ GlossEntry ::=
-->
<xsl:template match="glossentry">
- <fo:list-item>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <fo:list-item id="{$id}"
+ xsl:use-attribute-sets="normal.para.spacing">
<xsl:apply-templates/>
</fo:list-item>
</xsl:template>
<xsl:template match="glossentry/glossterm">
- <fo:list-item-label>
+ <fo:list-item-label end-indent="label-end()">
<fo:block>
<xsl:apply-templates/>
</fo:block>
@@ -200,10 +212,12 @@ GlossEntry ::=
<xsl:variable name="otherterm" select="@otherterm"/>
<xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
<xsl:variable name="target" select="$targets[1]"/>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>
- <xsl:call-template name="gentext.element.name"/>
- <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'glossary'"/>
+ <xsl:with-param name="name" select="'see'"/>
+ </xsl:call-template>
<xsl:choose>
<xsl:when test="@otherterm">
<xsl:apply-templates select="$target" mode="xref"/>
@@ -218,7 +232,18 @@ GlossEntry ::=
</xsl:template>
<xsl:template match="glossentry/glossdef">
- <fo:list-item-body><xsl:apply-templates/></fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
+ <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
+ <xsl:if test="glossseealso">
+ <fo:block>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'glossary'"/>
+ <xsl:with-param name="name" select="'seealso'"/>
+ </xsl:call-template>
+ <xsl:apply-templates select="glossseealso"/>
+ </fo:block>
+ </xsl:if>
+ </fo:list-item-body>
</xsl:template>
<xsl:template match="glossentry/glossdef/para[1]">
@@ -231,19 +256,24 @@ GlossEntry ::=
<xsl:variable name="otherterm" select="@otherterm"/>
<xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
<xsl:variable name="target" select="$targets[1]"/>
- <fo:block>
- <xsl:call-template name="gentext.element.name"/>
- <xsl:call-template name="gentext.space"/>
- <xsl:choose>
- <xsl:when test="@otherterm">
- <xsl:apply-templates select="$target" mode="xref"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>.</xsl:text>
- </fo:block>
+
+ <xsl:choose>
+ <xsl:when test="@otherterm">
+ <xsl:apply-templates select="$target" mode="xref"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates/>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="position() = last()">
+ <xsl:text>.</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>, </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
@@ -253,9 +283,22 @@ GlossEntry ::=
</xsl:template>
<xsl:template match="glossterm" mode="xref">
- <xsl:apply-templates/>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="parent::glossentry"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <fo:basic-link internal-destination="{$id}"
+ xsl:use-attribute-sets="xref.properties">
+ <xsl:apply-templates/>
+ <xsl:call-template name="insert.page.citation">
+ <xsl:with-param name="id" select="$id"/>
+ </xsl:call-template>
+ </fo:basic-link>
</xsl:template>
+
<!-- ==================================================================== -->
</xsl:stylesheet>
diff --git a/tests/docbook/fo/graphics.xsl b/tests/docbook/fo/graphics.xsl
index e29958bc..54d102fa 100644
--- a/tests/docbook/fo/graphics.xsl
+++ b/tests/docbook/fo/graphics.xsl
@@ -2,10 +2,11 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:text5="http://nwalsh.com/com.nwalsh.saxon.TextFactory"
- xmlns:text6="http://nwalsh.com/com.nwalsh.saxon6.TextFactory"
- exclude-result-prefixes="xlink text5 text6"
- extension-element-prefixes="text5 text6"
+ xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
+ xmlns:xtext="com.nwalsh.xalan.Text"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="xlink stext xtext lxslt"
+ extension-element-prefixes="stext xtext"
version='1.0'>
<!-- ********************************************************************
@@ -21,6 +22,40 @@
******************************************************************** -->
+<!-- ==================================================================== -->
+<!-- Graphic format tests for the FO backend -->
+
+<!--
+FIXME: make is.graphic.* work correctly depending on the backend!
+<xsl:param name="passivetex.extensions" select="0" doc:type='boolean'/>
+<xsl:param name="fop.extensions" select="0" doc:type='boolean'/>
+-->
+
+<xsl:template name="is.graphic.format">
+ <xsl:param name="format"></xsl:param>
+ <xsl:if test="$format = 'PNG'
+ or $format = 'PDF'
+ or $format = 'JPG'
+ or $format = 'JPEG'
+ or $format = 'linespecific'
+ or $format = 'GIF'
+ or $format = 'GIF87a'
+ or $format = 'GIF89a'
+ or $format = 'BMP'">1</xsl:if>
+</xsl:template>
+
+<xsl:template name="is.graphic.extension">
+ <xsl:param name="ext"></xsl:param>
+ <xsl:if test="$ext = 'png'
+ or $ext = 'pdf'
+ or $ext = 'jpeg'
+ or $ext = 'jpg'
+ or $ext = 'gif'
+ or $ext = 'bmp'">1</xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
<xsl:template match="screenshot">
<fo:block>
<xsl:apply-templates/>
@@ -31,6 +66,8 @@
</xsl:template>
<!-- ==================================================================== -->
+<!-- Override these templates for FO -->
+<!-- ==================================================================== -->
<xsl:template name="process.image">
<!-- When this template is called, the current node should be -->
@@ -43,6 +80,8 @@
<xsl:value-of select="unparsed-entity-uri(@entityref)"/>
</xsl:when>
<xsl:when test="@fileref">
+ <!-- FIXME: is this right? What if @fileref is a relative -->
+ <!-- URI? What if @fileref contains backslashes? -->
<xsl:text>file:</xsl:text>
<xsl:value-of select="@fileref"/>
</xsl:when>
@@ -113,9 +152,24 @@
with contributions from the specified width and height). I'm not
sure how to specify that... -->
- <fo:external-graphic src="{$filename}"
- content-width="{$width}" content-height="{$width}"
- width="auto" height="auto"/>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0
+ or $fop.extensions != 0
+ or $arbortext.extensions != 0">
+ <fo:external-graphic src="{$filename}"
+ content-width="{$width}"
+ content-height="{$height}"
+ width="auto"
+ height="auto"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:external-graphic src="url({$filename})"
+ content-width="{$width}"
+ content-height="{$height}"
+ width="auto"
+ height="auto"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
@@ -128,49 +182,40 @@
<xsl:template match="inlinegraphic">
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+ <xsl:variable name="filename">
+ <xsl:choose>
+ <xsl:when test="@entityref">
+ <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@fileref"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:choose>
<xsl:when test="@format='linespecific'">
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.textinsert != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $textinsert.extension != '0'">
<xsl:choose>
- <xsl:when test="@entityref">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <stext:insertfile href="{$filename}"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xtext:insertfile href="{$filename}"/>
</xsl:when>
<xsl:otherwise>
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{@fileref}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{@fileref}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to insert files with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad">
- <xsl:choose>
- <xsl:when test="@entityref">
- <xsl:attribute name="href">
- <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href">
- <xsl:value-of select="@fileref"/>
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </a>
+ <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
+ href="{$filename}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -195,55 +240,46 @@
<!-- ==================================================================== -->
+<xsl:template match="imageobjectco">
+ <xsl:apply-templates select="imageobject"/>
+ <xsl:apply-templates select="calloutlist"/>
+</xsl:template>
+
<xsl:template match="imageobject">
<xsl:apply-templates select="imagedata"/>
</xsl:template>
<xsl:template match="imagedata">
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+ <xsl:variable name="filename">
+ <xsl:call-template name="mediaobject.filename">
+ <xsl:with-param name="object" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
<xsl:choose>
<xsl:when test="@format='linespecific'">
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.textinsert != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $textinsert.extension != '0'">
<xsl:choose>
- <xsl:when test="@entityref">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <stext:insertfile href="{$filename}"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xtext:insertfile href="{$filename}"/>
</xsl:when>
<xsl:otherwise>
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{@fileref}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{@fileref}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to insert files with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad">
- <xsl:choose>
- <xsl:when test="@entityref">
- <xsl:attribute name="href">
- <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href">
- <xsl:value-of select="@fileref"/>
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </a>
+ <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
+ href="{$filename}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
diff --git a/tests/docbook/fo/index.xsl b/tests/docbook/fo/index.xsl
index 6e3caf1a..f6095712 100644
--- a/tests/docbook/fo/index.xsl
+++ b/tests/docbook/fo/index.xsl
@@ -1,36 +1,4 @@
<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary 'concat(primary/@sortas, primary[not(@sortas)])'>
-<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
-<!ENTITY tertiary 'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
-
-<!ENTITY section '(ancestor-or-self::set
- |ancestor-or-self::book
- |ancestor-or-self::part
- |ancestor-or-self::reference
- |ancestor-or-self::partintro
- |ancestor-or-self::chapter
- |ancestor-or-self::appendix
- |ancestor-or-self::preface
- |ancestor-or-self::section
- |ancestor-or-self::sect1
- |ancestor-or-self::sect2
- |ancestor-or-self::sect3
- |ancestor-or-self::sect4
- |ancestor-or-self::sect5
- |ancestor-or-self::refsect1
- |ancestor-or-self::refsect2
- |ancestor-or-self::refsect3
- |ancestor-or-self::simplesect
- |ancestor-or-self::bibliography
- |ancestor-or-self::glossary
- |ancestor-or-self::index)[last()]'>
-
-<!ENTITY section.id 'generate-id(&section;)'>
-<!ENTITY sep '" "'>
-]>
-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version='1.0'>
@@ -144,293 +112,8 @@
<xsl:template match="indexentry">
</xsl:template>
-<!-- ==================================================================== -->
-<!-- Derived from Jeni Tennison's work in the HTML case -->
-
-<xsl:key name="letter"
- match="indexterm"
- use="substring(&primary;, 1, 1)"/>
-
-<xsl:key name="primary"
- match="indexterm"
- use="&primary;"/>
-
-<xsl:key name="secondary"
- match="indexterm"
- use="concat(&primary;, &sep;, &secondary;)"/>
-
-<xsl:key name="tertiary"
- match="indexterm"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-
-<xsl:key name="primary-section"
- match="indexterm[not(secondary) and not(see)]"
- use="concat(&primary;, &sep;, &section.id;)"/>
-
-<xsl:key name="secondary-section"
- match="indexterm[not(tertiary) and not(see)]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &section.id;)"/>
-
-<xsl:key name="tertiary-section"
- match="indexterm[not(see)]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, &section.id;)"/>
-
-<xsl:key name="see-also"
- match="indexterm[seealso]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso)"/>
-
-<xsl:key name="see"
- match="indexterm[see]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/>
-
-<xsl:key name="sections" match="*[@id]" use="@id"/>
-
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-
<xsl:template name="generate-index">
- <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
- substring(&primary;, 1, 1))[1]) = 1]"/>
- <xsl:variable name="alphabetical"
- select="$terms[contains(concat($lowercase, $uppercase),
- substring(&primary;, 1, 1))]"/>
- <xsl:variable name="others" select="$terms[not(contains(concat($lowercase,
- $uppercase),
- substring(&primary;, 1, 1)))]"/>
- <fo:block>
- <xsl:if test="$others">
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always"
- space-before="1em">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'index symbols'"/>
- </xsl:call-template>
- </fo:block>
- <fo:block>
- <xsl:apply-templates select="$others[count(.|key('primary',
- &primary;)[1]) = 1]"
- mode="index-primary">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </fo:block>
- </xsl:if>
- <xsl:apply-templates select="$alphabetical[count(.|key('letter',
- substring(&primary;, 1, 1))[1]) = 1]"
- mode="index-div">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div">
- <xsl:variable name="key" select="substring(&primary;, 1, 1)"/>
- <fo:block>
- <!-- this isn't quite exactly right. ideally all the symbols would -->
- <!-- be grouped together. as it stands, they all get separate divs -->
- <!-- but at least this test makes sure that they don't all get -->
- <!-- separate titles as well. -->
- <xsl:if test="contains(concat($lowercase, $uppercase), $key)">
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always"
- space-before="1em">
- <xsl:value-of select="translate($key, $lowercase, $uppercase)"/>
- </fo:block>
- </xsl:if>
- <fo:block>
- <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[1]) = 1]"
- mode="index-primary">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </fo:block>
- </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
- <xsl:variable name="key" select="&primary;"/>
- <xsl:variable name="refs" select="key('primary', $key)"/>
- <fo:block>
- <xsl:value-of select="primary"/>
-
- <xsl:variable name="page-number-citations">
- <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when test="$passivetex.extensions != '0'">
- <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
- <xsl:copy-of select="$page-number-citations"/>
- </fotex:sort>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$page-number-citations"/>
- </xsl:otherwise>
- </xsl:choose>
- </fo:block>
- <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
- <fo:block start-indent="1pc">
- <fo:block>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[1]) = 1]"
- mode="index-secondary">
- <xsl:sort select="&secondary;"/>
- </xsl:apply-templates>
- </fo:block>
- </fo:block>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
- <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
- <xsl:variable name="refs" select="key('secondary', $key)"/>
- <fo:block>
- <xsl:value-of select="secondary"/>
-
- <xsl:variable name="page-number-citations">
- <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when test="$passivetex.extensions != '0'">
- <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
- <xsl:copy-of select="$page-number-citations"/>
- </fotex:sort>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$page-number-citations"/>
- </xsl:otherwise>
- </xsl:choose>
- </fo:block>
- <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
- <fo:block start-indent="2pc">
- <fo:block>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[1]) = 1]"
- mode="index-tertiary">
- <xsl:sort select="&tertiary;"/>
- </xsl:apply-templates>
- </fo:block>
- </fo:block>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
- <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
- <xsl:variable name="refs" select="key('tertiary', $key)"/>
- <fo:block>
- <xsl:value-of select="tertiary"/>
-
- <xsl:variable name="page-number-citations">
- <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when test="$passivetex.extensions != '0'">
- <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
- <xsl:copy-of select="$page-number-citations"/>
- </fotex:sort>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$page-number-citations"/>
- </xsl:otherwise>
- </xsl:choose>
- </fo:block>
- <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
- <xsl:if test="$see">
- <fo:block>
- <fo:block>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- </fo:block>
- </fo:block>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
- <xsl:if test="$passivetex.extensions = '0'">
- <xsl:text>, </xsl:text>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="@zone and string(@zone)">
- <xsl:call-template name="reference">
- <xsl:with-param name="zones" select="normalize-space(@zone)"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
- <fo:page-number-citation ref-id="{$id}"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
- <xsl:param name="zones"/>
- <xsl:choose>
- <xsl:when test="contains($zones, ' ')">
- <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
- <xsl:variable name="target" select="key('sections', $zone)"/>
-
- <xsl:variable name="id">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="$target[1]"/>
- </xsl:call-template>
- </xsl:variable>
-
- <fo:page-number-citation ref-id="{$id}"/>
-
- <xsl:if test="$passivetex.extensions = '0'">
- <xsl:text>, </xsl:text>
- </xsl:if>
- <xsl:call-template name="reference">
- <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="zone" select="$zones"/>
- <xsl:variable name="target" select="key('sections', $zone)"/>
-
- <xsl:variable name="id">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="$target[1]"/>
- </xsl:call-template>
- </xsl:variable>
-
- <fo:page-number-citation ref-id="{$id}"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
- <fo:block><xsl:value-of select="see"/></fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
- <fo:block><xsl:value-of select="seealso"/></fo:block>
+ <!-- nop: use autoidx.xsl to get automatic indexing -->
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/fo/inline.xsl b/tests/docbook/fo/inline.xsl
index 7ac3ae40..3986458d 100644
--- a/tests/docbook/fo/inline.xsl
+++ b/tests/docbook/fo/inline.xsl
@@ -24,7 +24,7 @@
<xsl:param name="content">
<xsl:apply-templates/>
</xsl:param>
- <fo:inline font-family="monospace">
+ <fo:inline font-family="{$monospace.font.family}">
<xsl:copy-of select="$content"/>
</fo:inline>
</xsl:template>
@@ -51,7 +51,7 @@
<xsl:param name="content">
<xsl:apply-templates/>
</xsl:param>
- <fo:inline font-weight="bold" font-family="monospace">
+ <fo:inline font-weight="bold" font-family="{$monospace.font.family}">
<xsl:copy-of select="$content"/>
</fo:inline>
</xsl:template>
@@ -60,7 +60,7 @@
<xsl:param name="content">
<xsl:apply-templates/>
</xsl:param>
- <fo:inline font-style="italic" font-family="monospace">
+ <fo:inline font-style="italic" font-family="{$monospace.font.family}">
<xsl:copy-of select="$content"/>
</fo:inline>
</xsl:template>
@@ -121,6 +121,10 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+<xsl:template match="constant">
+ <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
<xsl:template match="database">
<xsl:call-template name="inline.charseq"/>
</xsl:template>
@@ -366,7 +370,7 @@
<xsl:choose>
<xsl:when test="$class='attribute'">
- <xsl:call-template name="inline.charseq"/>
+ <xsl:call-template name="inline.monoseq"/>
</xsl:when>
<xsl:when test="$class='attvalue'">
<xsl:call-template name="inline.monoseq"/>
@@ -419,6 +423,15 @@
</xsl:with-param>
</xsl:call-template>
</xsl:when>
+ <xsl:when test="$class='xmlpi'">
+ <xsl:call-template name="inline.monoseq">
+ <xsl:with-param name="content">
+ <xsl:text>&lt;?</xsl:text>
+ <xsl:apply-templates/>
+ <xsl:text>?&gt;</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
<xsl:when test="$class='starttag'">
<xsl:call-template name="inline.monoseq">
<xsl:with-param name="content">
@@ -428,6 +441,15 @@
</xsl:with-param>
</xsl:call-template>
</xsl:when>
+ <xsl:when test="$class='emptytag'">
+ <xsl:call-template name="inline.monoseq">
+ <xsl:with-param name="content">
+ <xsl:text>&lt;</xsl:text>
+ <xsl:apply-templates/>
+ <xsl:text>/&gt;</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
<xsl:when test="$class='sgmlcomment'">
<xsl:call-template name="inline.monoseq">
<xsl:with-param name="content">
@@ -551,9 +573,22 @@
</xsl:if>
</xsl:template>
+<xsl:template match="productnumber">
+ <xsl:call-template name="inline.charseq"/>
+</xsl:template>
+
<!-- ==================================================================== -->
-<xsl:template match="street|city|state|postcode|country|phone|fax|otheraddr">
+<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
+ <xsl:call-template name="inline.charseq"/>
+</xsl:template>
+
+<xsl:template match="phone|fax">
+ <xsl:call-template name="inline.charseq"/>
+</xsl:template>
+
+<!-- in Addresses, for example -->
+<xsl:template match="honorific|firstname|surname|lineage|othername">
<xsl:call-template name="inline.charseq"/>
</xsl:template>
diff --git a/tests/docbook/fo/lists.xsl b/tests/docbook/fo/lists.xsl
index 2e91f8f4..bdfd9b0d 100644
--- a/tests/docbook/fo/lists.xsl
+++ b/tests/docbook/fo/lists.xsl
@@ -22,7 +22,9 @@
<xsl:apply-templates select="title" mode="list.title.mode"/>
</xsl:if>
- <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing">
+ <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="1.5em"
+ provisional-label-separation="0.2em">
<xsl:apply-templates/>
</fo:list-block>
</xsl:template>
@@ -52,7 +54,9 @@
<xsl:apply-templates select="title" mode="list.title.mode"/>
</xsl:if>
- <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing">
+ <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="2em"
+ provisional-label-separation="0.2em">
<xsl:apply-templates/>
</fo:list-block>
</xsl:template>
@@ -71,21 +75,43 @@
</fo:list-item>
</xsl:template>
-<xsl:template match="listitem/para[1]">
+<xsl:template match="listitem/para[1]
+ |listitem/simpara[1]
+ |listitem/formalpara[1]
+ |callout/para[1]
+ |callout/simpara[1]
+ |callout/formalpara[1]"
+ priority="2">
<fo:block>
<xsl:apply-templates/>
</fo:block>
</xsl:template>
<xsl:template match="variablelist">
- <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <xsl:variable name="termlength">
+ <xsl:choose>
+ <!-- FIXME: handle @termlength="1in" -->
+ <xsl:when test="@termlength">
+ <xsl:value-of select="@termlength"/>
+ <xsl:text>em</xsl:text>
+ </xsl:when>
+ <!-- FIXME: calculate some reasonable width -->
+ <xsl:otherwise>
+ <xsl:text>1in</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:if test="title">
<xsl:apply-templates select="title" mode="list.title.mode"/>
</xsl:if>
<fo:list-block id="{$id}"
- provisional-distance-between-starts="3in"
+ provisional-distance-between-starts="{$termlength}"
provisional-label-separation="0.25in"
xsl:use-attribute-sets="list.block.spacing">
<xsl:apply-templates/>
@@ -296,7 +322,7 @@
<xsl:template match="procedure">
<xsl:variable name="title" select="title"/>
- <xsl:variable name="preamble"
+ <xsl:variable name="preamble"
select="*[not(self::step or self::title)]"/>
<xsl:variable name="steps" select="step"/>
@@ -308,8 +334,12 @@
<xsl:apply-templates select="./title" mode="procedure.title.mode"/>
</fo:block>
</xsl:if>
+
<xsl:apply-templates select="$preamble"/>
- <fo:list-block xsl:use-attribute-sets="list.block.spacing">
+
+ <fo:list-block xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="2em"
+ provisional-label-separation="0.2em">
<xsl:apply-templates select="$steps"/>
</fo:list-block>
</fo:block>
@@ -323,16 +353,40 @@
</xsl:template>
<xsl:template match="substeps">
- <fo:list-block xsl:use-attribute-sets="list.block.spacing">
+ <fo:list-block xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="2em"
+ provisional-label-separation="0.2em">
<xsl:apply-templates/>
</fo:list-block>
</xsl:template>
<xsl:template match="step">
+ <xsl:variable name="depth" select="count(ancestor::substeps)"/>
+ <xsl:variable name="type" select="$depth mod 5"/>
+
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>
- <xsl:number count="step" format="1."/>
+ <xsl:choose>
+ <xsl:when test="$depth = 0">
+ <xsl:number count="step" format="1."/>
+ </xsl:when>
+ <xsl:when test="$type = 1">
+ <xsl:number count="step" format="a."/>
+ </xsl:when>
+ <xsl:when test="$type = 2">
+ <xsl:number count="step" format="i."/>
+ </xsl:when>
+ <xsl:when test="$type = 3">
+ <xsl:number count="step" format="A."/>
+ </xsl:when>
+ <xsl:when test="$type = 4">
+ <xsl:number count="step" format="I."/>
+ </xsl:when>
+ <xsl:when test="$type = 0">
+ <xsl:number count="step" format="1."/>
+ </xsl:when>
+ </xsl:choose>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -388,15 +442,20 @@
<!-- ==================================================================== -->
<xsl:template match="calloutlist">
- <fo:block>
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+ <fo:block id="{$id}">
<xsl:if test="./title">
<fo:block font-weight="bold">
<xsl:apply-templates select="./title" mode="calloutlist.title.mode"/>
</fo:block>
</xsl:if>
+
<fo:list-block space-before.optimum="1em"
space-before.minimum="0.8em"
- space-before.maximum="1.2em">
+ space-before.maximum="1.2em"
+ provisional-distance-between-starts="2.2em"
+ provisional-label-separation="0.2em">
<xsl:apply-templates/>
</fo:list-block>
</fo:block>
@@ -410,7 +469,8 @@
</xsl:template>
<xsl:template match="callout">
- <fo:list-item>
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+ <fo:list-item id="{$id}">
<fo:list-item-label end-indent="label-end()">
<fo:block>
<xsl:call-template name="callout.arearefs">
diff --git a/tests/docbook/fo/pagesetup.xsl b/tests/docbook/fo/pagesetup.xsl
index a5566819..82116e6e 100644
--- a/tests/docbook/fo/pagesetup.xsl
+++ b/tests/docbook/fo/pagesetup.xsl
@@ -324,9 +324,7 @@
<xsl:param name="master-name" select="'unknown'"/>
<xsl:variable name="head">
<fo:block font-size="{$body.font.size}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
</fo:block>
</xsl:variable>
diff --git a/tests/docbook/fo/param.xsl b/tests/docbook/fo/param.xsl
index cc1b2ae9..bb17c8ce 100644
--- a/tests/docbook/fo/param.xsl
+++ b/tests/docbook/fo/param.xsl
@@ -95,6 +95,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
<xsl:param name="section.autolabel" select="0"/>
<xsl:param name="section.label.includes.component.label" select="0"/>
<xsl:param name="chapter.autolabel" select="1"/>
+<xsl:param name="appendix.autolabel" select="1"/>
<xsl:param name="part.autolabel" select="1"/>
<xsl:param name="preface.autolabel" select="0"/>
@@ -139,14 +140,15 @@ and the <sgmltag class="attribute">format</sgmltag> attribute is
</doc:variable>
<!-- ==================================================================== -->
-
-<xsl:attribute-set name="formal.title.attrs"
+<xsl:attribute-set name="formal.title.properties"
use-attribute-sets="normal.para.spacing">
<xsl:attribute name="font-weight">bold</xsl:attribute>
<xsl:attribute name="font-size">12pt</xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
</xsl:attribute-set>
-<doc:attribute-set name="formal.title.attrs" xmlns="">
+<doc:attribute-set name="formal.title.properties" xmlns="">
<refpurpose>Properties of formal object titles</refpurpose>
<refdescription>
<para>This attribute set is used to specify the properties of formal
@@ -156,8 +158,7 @@ object titles.
</doc:attribute-set>
<!-- ==================================================================== -->
-
-<xsl:attribute-set name="component.title.attrs">
+<xsl:attribute-set name="component.title.properties">
<xsl:attribute name="space-before.optimum">2em</xsl:attribute>
<xsl:attribute name="space-before.minimum">1.8em</xsl:attribute>
<xsl:attribute name="space-before.maximum">2.2em</xsl:attribute>
@@ -166,9 +167,11 @@ object titles.
<xsl:attribute name="space-after.optimum">1.5em</xsl:attribute>
<xsl:attribute name="space-after.minimum">1.3em</xsl:attribute>
<xsl:attribute name="space-after.maximum">1.8em</xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
</xsl:attribute-set>
-<doc:attribute-set name="component.title.attrs" xmlns="">
+<doc:attribute-set name="component.title.properties" xmlns="">
<refpurpose>Properties of component titles</refpurpose>
<refdescription>
<para>This attribute set is used to specify the properties of component
@@ -178,7 +181,80 @@ titles.
</doc:attribute-set>
<!-- ==================================================================== -->
+<xsl:attribute-set name="admonition.title.properties">
+ <xsl:attribute name="font-size">14pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+</xsl:attribute-set>
+
+<doc:attribute-set name="admonition.title.properties" xmlns="">
+<refpurpose>Properties of admonition titles</refpurpose>
+<refdescription>
+<para>This attribute set is used to specify the properties of admonition
+titles.
+</para>
+</refdescription>
+</doc:attribute-set>
+
+<!-- ==================================================================== -->
+<xsl:attribute-set name="toc.margin.properties">
+ <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
+ <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
+</xsl:attribute-set>
+
+<!-- ==================================================================== -->
+<xsl:attribute-set name="verbatim.properties">
+ <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
+</xsl:attribute-set>
+
+<!-- ==================================================================== -->
+<xsl:attribute-set name="monospace.verbatim.properties"
+ use-attribute-sets="verbatim.properties">
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$monospace.font.family"/>
+ </xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 0.9"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+</xsl:attribute-set>
+
+<!-- ==================================================================== -->
+<xsl:attribute-set name="xref.properties">
+<!--
+ <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+ <xsl:attribute name="padding-start">1pt</xsl:attribute>
+ <xsl:attribute name="padding-end">1pt</xsl:attribute>
+-->
+</xsl:attribute-set>
+
+<doc:attribute-set name="xref.properties" xmlns="">
+<refpurpose>Visual properties of hotlinks</refpurpose>
+<refdescription>
+<para>This attribute set is used to specify properties of xrefs
+</para>
+</refdescription>
+</doc:attribute-set>
+
+<!-- ==================================================================== -->
+<xsl:param name="insert.xref.page.number" select="0" doc:type='boolean'/>
+<doc:param name="insert.xref.page.number" xmlns="">
+<refpurpose>Turns page numbers in xrefs on and off</refpurpose>
+<refdescription>
+<para>When equal to 1, this parameter triggers generation of page
+number citations after xrefs.
+</para>
+</refdescription>
+</doc:param>
+<!-- ==================================================================== -->
<xsl:attribute-set name="normal.para.spacing">
<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
@@ -246,7 +322,7 @@ resolved.</para>
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="callout.graphics" select="'1'"/>
+<xsl:param name="callout.graphics" select="'0'"/>
<doc:param name="callout.graphics" xmlns="">
<refpurpose>Use graphics for callouts?</refpurpose>
@@ -259,6 +335,68 @@ Default graphics are provided in the distribution.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="callout.unicode" select="1"/>
+
+<doc:param name="callout.unicode" xmlns="">
+<refpurpose>First character to use for Unicode callouts</refpurpose>
+<refdescription>
+<para>If non-zero, callouts are presented with Unicode characters
+starting with the character specified. Zero indicates that Unicode
+callouts should not be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="callout.dingbats" select="'0'"/>
+
+<doc:param name="callout.dingbats" xmlns="">
+<refpurpose>Use Zapf Dingbats for callouts?</refpurpose>
+<refdescription>
+<para>If non-zero, callouts are presented with Zapf Dingbats.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="callout.unicode.start.character" select="10102"
+ doc:type='integer'/>
+
+<doc:param name="callout.unicode.start.character" xmlns="">
+<refpurpose>Number of the largest callout graphic</refpurpose>
+<refdescription>
+<para>If <parameter>callout.graphics</parameter>
+is non-zero, graphics are used to represent
+callout numbers. The value of
+<parameter>callout.graphics.number.limit</parameter>
+is
+the largest number for which a graphic exists. If the callout number
+exceeds this limit, the default presentation "(nnn)" will always
+be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="callout.unicode.number.limit" select="'10'"
+ doc:type='integer'/>
+
+<doc:param name="callout.unicode.number.limit" xmlns="">
+<refpurpose>Number of the largest callout graphic</refpurpose>
+<refdescription>
+<para>If <parameter>callout.graphics</parameter>
+is non-zero, graphics are used to represent
+callout numbers. The value of
+<parameter>callout.graphics.number.limit</parameter>
+is
+the largest number for which a graphic exists. If the callout number
+exceeds this limit, the default presentation "(nnn)" will always
+be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="callout.graphics.extension" select="'.png'"/>
<doc:param name="callout.graphics.extension" xmlns="">
@@ -299,23 +437,23 @@ be used.
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.extensions" select="'0'"/>
+<xsl:param name="use.extensions" select="'0'"/>
-<doc:param name="saxon.extensions" xmlns="">
-<refpurpose>Enable Saxon extensions</refpurpose>
+<doc:param name="use.extensions" xmlns="">
+<refpurpose>Enable extensions</refpurpose>
<refdescription>
-<para>If non-zero, saxon extensions may be used. Each extension is
+<para>If non-zero, extensions may be used. Each extension is
further controlled by its own parameter. But if
-<parameter>saxon.extensions</parameter> is zero, no extensions will
+<parameter>use.extensions</parameter> is zero, no extensions will
be used.
</para>
</refdescription>
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.textinsert" select="'1'"/>
+<xsl:param name="textinsert.extension" select="'1'"/>
-<doc:param name="saxon.textinsert" xmlns="">
+<doc:param name="textinsert.extension" xmlns="">
<refpurpose>Enable the textinsert extension element</refpurpose>
<refdescription>
<para>The textinsert extension element inserts the contents of a
@@ -325,9 +463,9 @@ a file into the result tree (as text).
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.linenumbering" select="'1'"/>
+<xsl:param name="linenumbering.extension" select="'1'"/>
-<doc:param name="saxon.linenumbering" xmlns="">
+<doc:param name="linenumbering.extension" xmlns="">
<refpurpose>Enable the line numbering extension</refpurpose>
<refdescription>
<para>If true, verbatim environments (elements that have the
@@ -374,9 +512,9 @@ the verbatim environment.
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.callouts" select="'1'"/>
+<xsl:param name="callouts.extension" select="'1'"/>
-<doc:param name="saxon.callouts" xmlns="">
+<doc:param name="callouts.extension" xmlns="">
<refpurpose>Enable the callout extension</refpurpose>
<refdescription>
<para>The callouts extension processes <sgmltag>areaset</sgmltag>
@@ -400,6 +538,44 @@ it will appear in the default column.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="tablecolumns.extension" select="'1'" doc:type='boolean'/>
+
+<doc:param name="tablecolumns.extension" xmlns="">
+<refpurpose>Enable the table columns extension function</refpurpose>
+<refdescription>
+<para>The table columns extension function adjusts the widths of table
+columns in the HTML result to more accurately reflect the specifications
+in the CALS table.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="nominal.table.width" select="'6in'" doc:type='length'/>
+
+<doc:param name="nominal.table.width" xmlns="">
+<refpurpose>The (absolute) nominal width of tables</refpurpose>
+<refdescription>
+<para>In order to convert CALS column widths into FO column widths, it
+is sometimes necessary to have an absolute table width to use for conversion
+of mixed absolute and relative widths. This value must be an absolute
+length (not a percentage).</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="default.table.width" select="''" doc:type='length'/>
+
+<doc:param name="default.table.width" xmlns="">
+<refpurpose>The default width of tables</refpurpose>
+<refdescription>
+<para>If specified, this value will be used for the WIDTH attribute on
+tables that do not specify an alternate width (with the dbhtml processing
+instruction).</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="paper.type" select="'USletter'"/>
<doc:param name="paper.type" xmlns="">
<refpurpose>Select the paper type</refpurpose>
@@ -831,7 +1007,7 @@ so that math can be performed on the font size by XSLT.
<doc:param name="stylesheet.result.type" xmlns="">
<refpurpose>Identifies the output format of this stylesheet</refpurpose>
<refdescription>
-<para>The Saxon extension functions need to know if the output format
+<para>The extension functions need to know if the output format
is HTML ('html') or XSL Formatting Objects ('fo'). This variable answers
that question. Valid settings are 'html' or 'fo'.</para>
</refdescription>
@@ -862,6 +1038,12 @@ of each division (sets, books, etc.)
</doc:param>
<!-- ==================================================================== -->
+
+<xsl:param name="generate.book.toc" select="'1'" doc:type='boolean'/>
+<xsl:param name="process.source.toc" select='0' doc:type='boolean'/>
+<xsl:param name="process.empty.source.toc" select='0' doc:type='boolean'/>
+
+<!-- ==================================================================== -->
<xsl:param name="generate.division.figure.lot" select="1" doc:type='boolean'/>
<doc:param name="generate.division.figure.lot" xmlns="">
@@ -906,6 +1088,12 @@ of each division (sets, books, etc.)
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="generate.book.figure.lot" select="1" doc:type='boolean'/>
+<xsl:param name="generate.book.example.lot" select="1" doc:type='boolean'/>
+<xsl:param name="generate.book.equation.lot" select="1" doc:type='boolean'/>
+<xsl:param name="generate.book.table.lot" select="1" doc:type='boolean'/>
+
+<!-- ==================================================================== -->
<xsl:param name="passivetex.extensions" select="0" doc:type='boolean'/>
<doc:param name="passivetex.extensions" xmlns="">
@@ -920,6 +1108,32 @@ and sorted index terms.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="arbortext.extensions" select="0" doc:type='boolean'/>
+
+<doc:param name="arbortext.extensions" xmlns="">
+<refpurpose>Enable Arbortext extensions?</refpurpose>
+<refdescription>
+<para>If non-zero,
+<ulink url="http://www.arbortext.com/">Arbortext</ulink>
+extensions will be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="fop.extensions" select="0" doc:type='boolean'/>
+
+<doc:param name="fop.extensions" xmlns="">
+<refpurpose>Enable FOP extensions?</refpurpose>
+<refdescription>
+<para>If non-zero,
+<ulink url="http://xml.apache.org/fop/">FOP</ulink>
+extensions will be used. At present, this consists of PDF bookmarks.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="default.units" select="'pt'" doc:type='list'
doc:list='cm mm in pt pc px em'/>
@@ -927,7 +1141,7 @@ and sorted index terms.
<refpurpose>Default units for an unqualified dimension</refpurpose>
<refdescription>
<para>If an unqualified dimension is encountered (for example, in a
-graphic width), the <param>default-units</param> will be used for the
+graphic width), the <parameter>default-units</parameter> will be used for the
units. Unqualified dimensions are not allowed in XSL Formatting Objects.
</para>
</refdescription>
@@ -937,5 +1151,20 @@ units. Unqualified dimensions are not allowed in XSL Formatting Objects.
<xsl:param name="generate.index" select="1" doc:type='boolean'/>
+<!-- ==================================================================== -->
+<xsl:param name="label.from.part" select="'0'" doc:type='boolean'/>
+
+<doc:param name="label.from.part" xmlns="">
+<refpurpose>Renumber chapters in each part?</refpurpose>
+<refdescription>
+<para>If <parameter>label.from.part</parameter> is non-zero, components
+(<sgmltag>chapter</sgmltag>s, <sgmltag>appendixe</sgmltag>s, etc.)
+will be numbered from 1 in each <sgmltag>part</sgmltag>. Otherwise,
+they will be numbered monotonically throughout each
+<sgmltag>book</sgmltag>.
+</para>
+</refdescription>
+</doc:param>
+
</xsl:stylesheet>
diff --git a/tests/docbook/fo/qandaset.xsl b/tests/docbook/fo/qandaset.xsl
index 412f6821..bb8b6d45 100644
--- a/tests/docbook/fo/qandaset.xsl
+++ b/tests/docbook/fo/qandaset.xsl
@@ -1,5 +1,6 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
version='1.0'>
<!-- ********************************************************************
@@ -18,6 +19,127 @@
<!-- ==================================================================== -->
-<!-- FIXME: WRITE THIS! -->
+<xsl:template match="qandaset">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+ <fo:block id="{$id}">
+ <xsl:if test="title">
+ <xsl:apply-templates select="title"/>
+ </xsl:if>
+
+ <xsl:apply-templates select="*[name(.) != 'title'
+ and name(.) != 'qandadiv'
+ and name(.) != 'qandaentry']"/>
+ <xsl:apply-templates select="qandadiv"/>
+
+ <xsl:if test="qandaentry">
+ <fo:list-block xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="2.5em"
+ provisional-label-separation="0.2em">
+ <xsl:apply-templates select="qandaentry"/>
+ </fo:list-block>
+ </xsl:if>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="qandaset/title">
+ <xsl:variable name="enclsect" select="(ancestor::section
+ | ancestor::simplesect
+ | ancestor::sect5
+ | ancestor::sect4
+ | ancestor::sect3
+ | ancestor::sect2
+ | ancestor::sect1
+ | ancestor::refsect3
+ | ancestor::refsect2
+ | ancestor::refsect1)[last()]"/>
+ <xsl:variable name="sectlvl">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$enclsect"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:call-template name="section.heading">
+ <xsl:with-param name="level" select="$sectlvl"/>
+ <xsl:with-param name="title" select="."/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="qandadiv">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+ <fo:block id="{$id}">
+ <xsl:apply-templates select="title"/>
+ <xsl:apply-templates select="*[name(.) != 'title'
+ and name(.) != 'qandadiv'
+ and name(.) != 'qandaentry']"/>
+ <fo:block start-indent="{count(ancestor::qandadiv)*2}pc">
+ <xsl:apply-templates select="qandadiv"/>
+
+ <xsl:if test="qandaentry">
+ <fo:list-block xsl:use-attribute-sets="list.block.spacing"
+ provisional-distance-between-starts="2.5em"
+ provisional-label-separation="0.2em">
+ <xsl:apply-templates select="qandaentry"/>
+ </fo:list-block>
+ </xsl:if>
+ </fo:block>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="qandadiv/title">
+ <xsl:variable name="enclsect" select="(ancestor::section
+ | ancestor::simplesect
+ | ancestor::sect5
+ | ancestor::sect4
+ | ancestor::sect3
+ | ancestor::sect2
+ | ancestor::sect1
+ | ancestor::refsect3
+ | ancestor::refsect2
+ | ancestor::refsect1)[last()]"/>
+ <xsl:variable name="sectlvl">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$enclsect"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:call-template name="section.heading">
+ <xsl:with-param name="level" select="$sectlvl + count(ancestor::qandadiv)"/>
+ <xsl:with-param name="title" select="."/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="qandaentry">
+ <xsl:apply-templates/>
+<!--
+ <fo:block>
+ <xsl:if test="@id">
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates/>
+ </fo:block>
+-->
+</xsl:template>
+
+<xsl:template match="question|answer">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+ <xsl:variable name="entry.id">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="parent::*"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
+ <fo:list-item-label id="{$id}" end-indent="label-end()">
+ <fo:block>
+ <xsl:call-template name="question.answer.label"/>
+ </fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <xsl:apply-templates/>
+ </fo:list-item-body>
+ </fo:list-item>
+</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/fo/refentry.xsl b/tests/docbook/fo/refentry.xsl
index 250aa7fe..b1ccdc05 100644
--- a/tests/docbook/fo/refentry.xsl
+++ b/tests/docbook/fo/refentry.xsl
@@ -98,9 +98,7 @@
<xsl:template match="refentry">
<xsl:variable name="id">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="ancestor::reference"/>
- </xsl:call-template>
+ <xsl:call-template name="object.id"/>
</xsl:variable>
<xsl:variable name="master-name">
<xsl:call-template name="select.pagemaster"/>
@@ -125,7 +123,15 @@
<fo:flow flow-name="xsl-region-body">
<fo:block font-size="20pt" font-weight="bold">
- <xsl:text>What about the title?</xsl:text>
+ <!-- FIXME: is this right? -->
+ <xsl:choose>
+ <xsl:when test="refmeta/refentrytitle">
+ <xsl:apply-templates select="refmeta/refentrytitle" mode="title"/>
+ </xsl:when>
+ <xsl:when test="refnamediv/refname">
+ <xsl:apply-templates select="refnamediv/refname" mode="title"/>
+ </xsl:when>
+ </xsl:choose>
</fo:block>
<xsl:apply-templates/>
</fo:flow>
@@ -157,7 +163,9 @@
<xsl:template match="refname">
<xsl:if test="$refentry.generate.name != 0">
<fo:block font-size="18pt" font-weight="bold">
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'RefName'"/>
+ </xsl:call-template>
</fo:block>
</xsl:if>
<xsl:apply-templates/>
diff --git a/tests/docbook/fo/sections.xsl b/tests/docbook/fo/sections.xsl
index c2180ade..5a2fb1d8 100644
--- a/tests/docbook/fo/sections.xsl
+++ b/tests/docbook/fo/sections.xsl
@@ -68,7 +68,7 @@
|ancestor::sect3
|ancestor::sect4
|ancestor::sect5)[last()]"/>
- <fo:block keep-with-next="always">
+ <fo:block keep-with-next.within-column="always">
<xsl:variable name="id">
<xsl:call-template name="object.id">
<xsl:with-param name="object" select="$section"/>
@@ -82,7 +82,7 @@
</xsl:variable>
<xsl:variable name="title">
- <xsl:apply-templates select="$section" mode="title.ref"/>
+ <xsl:apply-templates select="$section" mode="object.title.markup"/>
</xsl:variable>
<xsl:if test="$passivetex.extensions != 0">
@@ -224,25 +224,32 @@
<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
</xsl:template>
+<xsl:template match="section/subtitle"></xsl:template>
<xsl:template match="section/title"></xsl:template>
<xsl:template match="sectioninfo"></xsl:template>
<xsl:template match="sect1/title"></xsl:template>
+<xsl:template match="sect1/subtitle"></xsl:template>
<xsl:template match="sect1info"></xsl:template>
<xsl:template match="sect2/title"></xsl:template>
+<xsl:template match="sect2/subtitle"></xsl:template>
<xsl:template match="sect2info"></xsl:template>
<xsl:template match="sect3/title"></xsl:template>
+<xsl:template match="sect3/subtitle"></xsl:template>
<xsl:template match="sect3info"></xsl:template>
<xsl:template match="sect4/title"></xsl:template>
+<xsl:template match="sect4/subtitle"></xsl:template>
<xsl:template match="sect4info"></xsl:template>
<xsl:template match="sect5/title"></xsl:template>
+<xsl:template match="sect5/subtitle"></xsl:template>
<xsl:template match="sect5info"></xsl:template>
<xsl:template match="simplesect/title"></xsl:template>
+<xsl:template match="simplesect/subtitle"></xsl:template>
<!-- ==================================================================== -->
@@ -259,8 +266,9 @@
<xsl:otherwise>10</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <fo:block font-size="{$fsize}pt"
+ <fo:block font-size="{$fsize}pt"
font-weight="bold"
+ font-family="{$title.font.family}"
space-before.minimum="1em"
space-before.optimum="1.5em"
space-before.maximum="2em">
@@ -271,10 +279,82 @@
<!-- ==================================================================== -->
<xsl:template match="bridgehead">
- <!-- need to calculate depth! -->
- <fo:block font-size="16pt" font-weight="bold">
- <xsl:apply-templates/>
- </fo:block>
+ <xsl:variable name="container"
+ select="(ancestor::appendix
+ |ancestor::article
+ |ancestor::bibliography
+ |ancestor::chapter
+ |ancestor::glossary
+ |ancestor::glossdiv
+ |ancestor::index
+ |ancestor::partintro
+ |ancestor::preface
+ |ancestor::refsect1
+ |ancestor::refsect2
+ |ancestor::refsect3
+ |ancestor::sect1
+ |ancestor::sect2
+ |ancestor::sect3
+ |ancestor::sect4
+ |ancestor::sect5
+ |ancestor::section
+ |ancestor::setindex
+ |ancestor::simplesect)[last()]"/>
+
+ <xsl:variable name="clevel">
+ <xsl:choose>
+ <xsl:when test="local-name($container) = 'appendix'
+ or local-name($container) = 'chapter'
+ or local-name($container) = 'article'
+ or local-name($container) = 'bibliography'
+ or local-name($container) = 'glossary'
+ or local-name($container) = 'index'
+ or local-name($container) = 'partintro'
+ or local-name($container) = 'preface'
+ or local-name($container) = 'setindex'">2</xsl:when>
+ <xsl:when test="local-name($container) = 'glossdiv'">
+ <xsl:value-of select="count(ancestor::glossdiv)+2"/>
+ </xsl:when>
+ <xsl:when test="local-name($container) = 'sect1'
+ or local-name($container) = 'sect2'
+ or local-name($container) = 'sect3'
+ or local-name($container) = 'sect4'
+ or local-name($container) = 'sect5'
+ or local-name($container) = 'refsect1'
+ or local-name($container) = 'refsect2'
+ or local-name($container) = 'refsect3'
+ or local-name($container) = 'section'
+ or local-name($container) = 'simplesect'">
+ <xsl:variable name="slevel">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$container"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:value-of select="$slevel + 1"/>
+ </xsl:when>
+ <xsl:otherwise>2</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="level">
+ <xsl:choose>
+ <xsl:when test="@renderas = 'sect1'">2</xsl:when>
+ <xsl:when test="@renderas = 'sect2'">3</xsl:when>
+ <xsl:when test="@renderas = 'sect3'">4</xsl:when>
+ <xsl:when test="@renderas = 'sect4'">5</xsl:when>
+ <xsl:when test="@renderas = 'sect5'">6</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$clevel"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:call-template name="section.heading">
+ <xsl:with-param name="level" select="$level"/>
+ <xsl:with-param name="title">
+ <xsl:apply-templates/>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/fo/synop.xsl b/tests/docbook/fo/synop.xsl
index 4eb9a04b..3a0d0310 100644
--- a/tests/docbook/fo/synop.xsl
+++ b/tests/docbook/fo/synop.xsl
@@ -145,7 +145,7 @@
</xsl:template>
<xsl:template match="funcprototype">
- <fo:block font-family="monospace">
+ <fo:block font-family="{$monospace.font.family}">
<xsl:apply-templates/>
<xsl:if test="$funcsynopsis.style='kr'">
<xsl:apply-templates select="./paramdef" mode="kr-funcsynopsis-mode"/>
@@ -154,7 +154,7 @@
</xsl:template>
<xsl:template match="funcdef">
- <fo:inline font-family="monospace">
+ <fo:inline font-family="{$monospace.font.family}">
<xsl:apply-templates/>
</fo:inline>
</xsl:template>
diff --git a/tests/docbook/fo/table.xsl b/tests/docbook/fo/table.xsl
index 87546c7c..2db447af 100644
--- a/tests/docbook/fo/table.xsl
+++ b/tests/docbook/fo/table.xsl
@@ -1,8 +1,11 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
- exclude-result-prefixes="doc"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
+ xmlns:xtbl="com.nwalsh.xalan.Table"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="doc stbl xtbl lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -46,11 +49,114 @@ to be incomplete. Don't forget to read the source, too :-)</para>
</partintro>
</doc:reference>
+<!-- ==================================================================== -->
+
+<lxslt:component prefix="xtbl"
+ functions="adjustColumnWidths"/>
+
+<!-- ==================================================================== -->
+
+<xsl:param name="table-border-thickness" select="'0.5pt'"/>
+<xsl:param name="table-border-padding" select="'2pt'"/>
+<xsl:param name="table-border-style" select="'solid'"/>
+<xsl:param name="table-border-color" select="'black'"/>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="border">
+ <xsl:param name="side" select="'left'"/>
+ <xsl:param name="padding" select="0"/>
+
+ <xsl:attribute name="border-{$side}">
+ <xsl:value-of select="$table-border-thickness"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$table-border-style"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$table-border-color"/>
+ <xsl:text> </xsl:text>
+ </xsl:attribute>
+ <xsl:if test="$padding != 0">
+ <xsl:attribute name="padding-{$side}">
+ <xsl:value-of select="$table-border-padding"/>
+ </xsl:attribute>
+ </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
<xsl:template match="tgroup">
- <xsl:call-template name="generate.colgroup">
- <xsl:with-param name="cols" select="@cols"/>
- </xsl:call-template>
- <xsl:apply-templates/>
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:variable name="explicit.table.width">
+ <xsl:call-template name="dbfo-attribute">
+ <xsl:with-param name="pis"
+ select="../processing-instruction('dbfo')"/>
+ <xsl:with-param name="attribute" select="'table-width'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:variable name="table.width">
+ <xsl:choose>
+ <xsl:when test="$explicit.table.width != ''">
+ <xsl:value-of select="$explicit.table.width"/>
+ </xsl:when>
+ <xsl:when test="$default.table.width = ''">
+ <xsl:text>100%</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$default.table.width"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="colspecs">
+ <xsl:choose>
+ <xsl:when test="$use.extensions != 0
+ and $tablecolumns.extension != 0">
+ <xsl:call-template name="generate.colgroup.raw">
+ <xsl:with-param name="cols" select="@cols"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="generate.colgroup">
+ <xsl:with-param name="cols" select="@cols"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$use.extensions != 0
+ and $tablecolumns.extension != 0">
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON 6')">
+ <xsl:copy-of select="stbl:adjustColumnWidths($colspecs)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'SAXON 5')">
+ <!-- the saxon5 extension doesn't support this (yet) -->
+ <xsl:call-template name="generate.colgroup">
+ <xsl:with-param name="cols" select="@cols"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xtbl:adjustColumnWidths($colspecs)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do adjust column widths with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="$colspecs"/>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:apply-templates select="thead"/>
+ <xsl:apply-templates select="tbody"/>
+ <xsl:apply-templates select="tfoot"/>
</xsl:template>
<xsl:template match="colspec"></xsl:template>
@@ -58,19 +164,96 @@ to be incomplete. Don't forget to read the source, too :-)</para>
<xsl:template match="spanspec"></xsl:template>
<xsl:template match="thead">
+ <xsl:variable name="tgroup" select="parent::*"/>
+ <xsl:variable name="frame" select="$tgroup/parent::*/@frame"/>
+
<fo:table-header>
+ <xsl:choose>
+ <xsl:when test="$frame='topbot' or $frame='top'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'top'"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$frame='sides'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'left'"/>
+ </xsl:call-template>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'right'"/>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
<xsl:apply-templates/>
</fo:table-header>
</xsl:template>
<xsl:template match="tbody">
+ <xsl:variable name="tgroup" select="parent::*"/>
+ <xsl:variable name="frame" select="$tgroup/parent::*/@frame"/>
<fo:table-body>
+ <xsl:choose>
+ <xsl:when test="$frame='top'">
+ <xsl:choose>
+ <xsl:when test="preceding-sibling::thead">
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'top'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="$frame='bottom'">
+ <xsl:choose>
+ <xsl:when test="preceding-sibling::tfoot">
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'bottom'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="$frame='topbot'">
+ <xsl:choose>
+ <xsl:when test="preceding-sibling::thead">
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'top'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="preceding-sibling::tfoot">
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'bottom'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="$frame='sides'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'left'"/>
+ </xsl:call-template>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'right'"/>
+ </xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
<xsl:apply-templates/>
</fo:table-body>
</xsl:template>
<xsl:template match="row">
<fo:table-row>
+ <xsl:if test="@rowsep='1'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'bottom'"/>
+ </xsl:call-template>
+ </xsl:if>
<xsl:apply-templates/>
</fo:table-row>
</xsl:template>
@@ -88,10 +271,50 @@ to be incomplete. Don't forget to read the source, too :-)</para>
</xsl:template>
<xsl:template name="process.cell">
- <xsl:param name="content">
+ <xsl:variable name="row" select="parent::row"/>
+ <xsl:variable name="group" select="$row/parent::*[1]"/>
+ <xsl:variable name="frame" select="ancestor::tgroup/parent::*/@frame"/>
+
+ <xsl:variable name="content">
<xsl:apply-templates/>
- </xsl:param>
+ </xsl:variable>
+
<fo:table-cell>
+ <xsl:choose>
+ <xsl:when test="$frame='all'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'left'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'right'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'top'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'bottom'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="@colsep='1'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'right'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:if test="@rowsep='1'">
+ <xsl:call-template name="border">
+ <xsl:with-param name="side" select="'bottom'"/>
+ <xsl:with-param name="padding" select="1"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+
<xsl:if test="@morerows">
<xsl:attribute name="number-rows-spanned">
<xsl:value-of select="@morerows+1"/>
@@ -109,17 +332,27 @@ to be incomplete. Don't forget to read the source, too :-)</para>
</fo:table-cell>
</xsl:template>
-<xsl:template name="generate.colgroup">
+<xsl:template name="generate.colgroup.raw">
<xsl:param name="cols" select="1"/>
<xsl:param name="count" select="1"/>
-<!--
- <xsl:message>
- <xsl:text>generate.colgroup: </xsl:text>
- <xsl:value-of select="$cols"/><xsl:text>, </xsl:text>
- <xsl:value-of select="$count"/>
- </xsl:message>
--->
+ <xsl:choose>
+ <xsl:when test="$count>$cols"></xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="generate.col.raw">
+ <xsl:with-param name="countcol" select="$count"/>
+ </xsl:call-template>
+ <xsl:call-template name="generate.colgroup.raw">
+ <xsl:with-param name="cols" select="$cols"/>
+ <xsl:with-param name="count" select="$count+1"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="generate.colgroup">
+ <xsl:param name="cols" select="1"/>
+ <xsl:param name="count" select="1"/>
<xsl:choose>
<xsl:when test="$count>$cols"></xsl:when>
@@ -135,28 +368,79 @@ to be incomplete. Don't forget to read the source, too :-)</para>
</xsl:choose>
</xsl:template>
-<xsl:template name="generate.col">
+<xsl:template name="generate.col.raw">
<!-- generate the table-column for column countcol -->
<xsl:param name="countcol">1</xsl:param>
<xsl:param name="colspecs" select="./colspec"/>
<xsl:param name="count">1</xsl:param>
<xsl:param name="colnum">1</xsl:param>
-<!--
- <xsl:message>
- <xsl:text>generate.col: </xsl:text>
- <xsl:value-of select="$countcol"/><xsl:text>, </xsl:text>
- <xsl:value-of select="count($colspecs)"/><xsl:text>, </xsl:text>
- <xsl:value-of select="$count"/><xsl:text>, </xsl:text>
- <xsl:value-of select="$colnum"/><xsl:text>, </xsl:text>
- </xsl:message>
--->
+ <xsl:choose>
+ <xsl:when test="$count>count($colspecs)">
+ <fo:table-column column-number="{$countcol}"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
+
+ <xsl:variable name="colspec.colnum">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colnum">
+ <xsl:value-of select="$colspec/@colnum"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$colnum"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="colspec.colwidth">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colwidth">
+ <xsl:value-of select="$colspec/@colwidth"/>
+ </xsl:when>
+ <xsl:otherwise>1*</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$colspec.colnum=$countcol">
+ <fo:table-column column-number="{$countcol}">
+ <xsl:attribute name="column-width">
+ <xsl:value-of select="$colspec.colwidth"/>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="generate.col.raw">
+ <xsl:with-param name="countcol" select="$countcol"/>
+ <xsl:with-param name="colspecs" select="$colspecs"/>
+ <xsl:with-param name="count" select="$count+1"/>
+ <xsl:with-param name="colnum">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colnum">
+ <xsl:value-of select="$colspec/@colnum + 1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$colnum + 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="generate.col">
+ <!-- generate the table-column for column countcol -->
+ <xsl:param name="countcol">1</xsl:param>
+ <xsl:param name="colspecs" select="./colspec"/>
+ <xsl:param name="count">1</xsl:param>
+ <xsl:param name="colnum">1</xsl:param>
<xsl:choose>
<xsl:when test="$count>count($colspecs)">
-<!--
- <xsl:message>Assigning <xsl:value-of select="$countcol"/></xsl:message>
--->
<fo:table-column column-number="{$countcol}">
<xsl:variable name="colwidth">
<xsl:call-template name="calc.column.width"/>
@@ -191,15 +475,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
</xsl:choose>
</xsl:variable>
-<!--
- <xsl:message>==> <xsl:value-of select="$colspec.colnum"/></xsl:message>
--->
-
<xsl:choose>
<xsl:when test="$colspec.colnum=$countcol">
-<!--
- <xsl:message>Assigning <xsl:value-of select="$countcol"/></xsl:message>
--->
<fo:table-column column-number="{$countcol}">
<xsl:variable name="colwidth">
<xsl:call-template name="calc.column.width">
diff --git a/tests/docbook/fo/titlepage.templates.xml b/tests/docbook/fo/titlepage.templates.xml
index d81d98ec..b206a7e0 100644
--- a/tests/docbook/fo/titlepage.templates.xml
+++ b/tests/docbook/fo/titlepage.templates.xml
@@ -21,16 +21,18 @@
<t:titlepage element="article" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="component.title"
param:node="ancestor-or-self::article[1]"
+ fo:text-align="center"
fo:margin-left="-4pc"
fo:keep-with-next="always"
fo:font-size="&hsize5;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
- fo:font-family="{$title.font.family}"/>
+ <subtitle
+ fo:font-family="{$title.font.family}"
+ fo:text-align="center"/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -60,15 +62,17 @@
<t:titlepage element="set" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="division.title"
param:node="ancestor-or-self::set[1]"
+ fo:text-align="center"
fo:font-size="&hsize5;"
fo:space-before="&hsize5space;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
- fo:font-family="{$title.font.family}"/>
+ <subtitle
+ fo:font-family="{$title.font.family}"
+ fo:text-align="center"/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -98,14 +102,16 @@
<t:titlepage element="book" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="division.title"
param:node="ancestor-or-self::book[1]"
+ fo:text-align="center"
fo:font-size="&hsize5;"
fo:space-before="&hsize5space;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
+ fo:text-align="center"
fo:font-size="&hsize4;"
fo:space-before="&hsize4space;"
fo:font-family="{$title.font.family}"/>
@@ -119,7 +125,7 @@
</t:titlepage-content>
<t:titlepage-content side="verso">
- <title predicate="[1]"
+ <title
fo:font-size="&hsize2;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
@@ -148,14 +154,16 @@
<t:titlepage element="part" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="division.title"
param:node="ancestor-or-self::part[1]"
+ fo:text-align="center"
fo:font-size="&hsize5;"
fo:space-before="&hsize5space;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
+ fo:text-align="center"
fo:font-size="&hsize4;"
fo:space-before="&hsize4space;"
fo:font-weight='bold'
@@ -178,13 +186,15 @@
<t:titlepage element="partintro" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
+ fo:text-align="center"
fo:font-size="&hsize3;"
fo:font-weight="bold"
fo:margin-left="-4pc"
fo:space-before="1em"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
+ fo:text-align="center"
fo:font-size="&hsize2;"
fo:font-weight="bold"
fo:font-style="italic"
@@ -218,15 +228,17 @@
<t:titlepage element="reference" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="division.title"
param:node="ancestor-or-self::reference[1]"
+ fo:text-align="center"
fo:font-size="&hsize5;"
fo:space-before="&hsize5space;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
- fo:font-family="{$title.font.family}"/>
+ <subtitle
+ fo:font-family="{$title.font.family}"
+ fo:text-align="center"/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -256,7 +268,7 @@
<t:titlepage element="dedication" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
named-template="component.title"
param:node="ancestor-or-self::dedication[1]"
@@ -264,7 +276,7 @@
fo:font-size="&hsize3;"
fo:font-family="{$title.font.family}"
fo:font-weight="bold"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
</t:titlepage-content>
@@ -285,7 +297,7 @@
<t:titlepage element="preface" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
named-template="component.title"
param:node="ancestor-or-self::preface[1]"
@@ -293,7 +305,7 @@
fo:font-size="&hsize3;"
fo:font-family="{$title.font.family}"
fo:font-weight="bold"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -324,14 +336,14 @@
<t:titlepage element="chapter" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="component.title"
param:node="ancestor-or-self::chapter[1]"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:space-before="0.5em"
fo:margin-left="-4pc"
fo:font-style="italic"
@@ -367,14 +379,14 @@
<t:titlepage element="appendix" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
named-template="component.title"
param:node="ancestor-or-self::appendix[1]"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
fo:font-weight="bold"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -405,10 +417,10 @@
<t:titlepage element="section" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -437,10 +449,10 @@
<t:titlepage element="sect1" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -469,10 +481,10 @@
<t:titlepage element="sect2" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -501,10 +513,10 @@
<t:titlepage element="sect3" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -533,10 +545,10 @@
<t:titlepage element="sect4" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -565,10 +577,10 @@
<t:titlepage element="sect5" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -597,10 +609,10 @@
<t:titlepage element="simplesect" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
fo:margin-left="-4pc"
fo:font-family="{$title.font.family}"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
<corpauthor/>
<authorgroup/>
@@ -631,7 +643,7 @@
<t:titlepage element="bibliography" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
named-template="component.title"
param:node="ancestor-or-self::bibliography[1]"
@@ -639,7 +651,7 @@
fo:font-size="&hsize3;"
fo:font-family="{$title.font.family}"
fo:font-weight="bold"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
</t:titlepage-content>
@@ -660,15 +672,15 @@
<t:titlepage element="glossary" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
named-template="component.title"
- param:node="ancestor-or-self::bibliography[1]"
+ param:node="ancestor-or-self::glossary[1]"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
fo:font-family="{$title.font.family}"
fo:font-weight="bold"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
</t:titlepage-content>
@@ -689,15 +701,15 @@
<t:titlepage element="index" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
named-template="component.title"
- param:node="ancestor-or-self::bibliography[1]"
+ param:node="ancestor-or-self::index[1]"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
fo:font-family="{$title.font.family}"
fo:font-weight="bold"/>
- <subtitle predicate="[1]"
+ <subtitle
fo:font-family="{$title.font.family}"/>
</t:titlepage-content>
@@ -718,10 +730,10 @@
<t:titlepage element="table.of.contents" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'TableofContents'"
+ named-template="gentext"
+ param:key="'TableofContents'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
@@ -744,10 +756,10 @@
<t:titlepage element="list.of.tables" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'ListofTables'"
+ named-template="gentext"
+ param:key="'ListofTables'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
@@ -770,10 +782,10 @@
<t:titlepage element="list.of.figures" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'ListofFigures'"
+ named-template="gentext"
+ param:key="'ListofFigures'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
@@ -796,10 +808,10 @@
<t:titlepage element="list.of.examples" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'ListofExamples'"
+ named-template="gentext"
+ param:key="'ListofExamples'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
@@ -822,10 +834,10 @@
<t:titlepage element="list.of.equations" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'ListofEquations'"
+ named-template="gentext"
+ param:key="'ListofEquations'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
@@ -848,10 +860,10 @@
<t:titlepage element="list.of.unknowns" wrapper="fo:block">
<t:titlepage-content side="recto">
- <title predicate="[1]"
+ <title
force="1"
- named-template="gentext.element.name"
- param:element.name="'ListofUnknown'"
+ named-template="gentext"
+ param:key="'ListofUnknown'"
fo:space-after="1em"
fo:margin-left="-4pc"
fo:font-size="&hsize3;"
diff --git a/tests/docbook/fo/titlepage.templates.xsl b/tests/docbook/fo/titlepage.templates.xsl
index 54731498..20bb3efe 100644
--- a/tests/docbook/fo/titlepage.templates.xsl
+++ b/tests/docbook/fo/titlepage.templates.xsl
@@ -3,18 +3,50 @@
<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
<xsl:template name="article.titlepage.recto">
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="(articleinfo/title|artheader/title|title)[1]"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="(articleinfo/subtitle|artheader/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor|artheader/corpauthor"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup|artheader/authorgroup"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author|artheader/author"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo|artheader/releaseinfo"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright|artheader/copyright"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice|artheader/legalnotice"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate|artheader/pubdate"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision|artheader/revision"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory|artheader/revhistory"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract|artheader/abstract"/>
+ <xsl:choose>
+ <xsl:when test="articleinfo/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
+ </xsl:when>
+ <xsl:when test="artheader/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="articleinfo/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="artheader/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
</xsl:template>
<xsl:template name="article.titlepage.verso">
@@ -52,7 +84,7 @@
</xsl:template>
<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="{$title.font.family}">
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor-or-self::article[1]"/>
</xsl:call-template>
@@ -60,7 +92,7 @@
</xsl:template>
<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" font-family="{$title.font.family}" text-align="center">
<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
@@ -126,8 +158,24 @@
</xsl:template>
<xsl:template name="set.titlepage.recto">
- <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="(setinfo/title|title)[1]"/>
- <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="(setinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="setinfo/title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="setinfo/subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
@@ -175,7 +223,7 @@
</xsl:template>
<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
<xsl:call-template name="division.title">
<xsl:with-param name="node" select="ancestor-or-self::set[1]"/>
</xsl:call-template>
@@ -183,7 +231,7 @@
</xsl:template>
<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.font.family}" text-align="center">
<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
@@ -249,15 +297,39 @@
</xsl:template>
<xsl:template name="book.titlepage.recto">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="(bookinfo/title|title)[1]"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="(bookinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="bookinfo/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="bookinfo/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
</xsl:template>
<xsl:template name="book.titlepage.verso">
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="(bookinfo/title|title)[1]"/>
+ <xsl:choose>
+ <xsl:when test="bookinfo/title">
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
<xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
<xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
@@ -299,7 +371,7 @@
</xsl:template>
<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
<xsl:call-template name="division.title">
<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
</xsl:call-template>
@@ -307,7 +379,7 @@
</xsl:template>
<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="20.736pt" space-before="15.552pt" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-family="{$title.font.family}">
<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
@@ -379,8 +451,30 @@
</xsl:template>
<xsl:template name="part.titlepage.recto">
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="(partinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="(partinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="partinfo/title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="partinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="part.titlepage.verso">
@@ -418,7 +512,7 @@
</xsl:template>
<xsl:template match="title" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
<xsl:call-template name="division.title">
<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
</xsl:call-template>
@@ -426,24 +520,56 @@
</xsl:template>
<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.font.family}">
<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
<xsl:template name="partintro.titlepage.recto">
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="(partintroinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="(partintroinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="partintroinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="partintroinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="partintro.titlepage.verso">
@@ -481,13 +607,13 @@
</xsl:template>
<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="{$title.font.family}">
<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.font.family}">
<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
@@ -553,18 +679,50 @@
</xsl:template>
<xsl:template name="reference.titlepage.recto">
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="(referenceinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="(referenceinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="referenceinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="referenceinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="reference.titlepage.verso">
@@ -602,7 +760,7 @@
</xsl:template>
<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.font.family}">
<xsl:call-template name="division.title">
<xsl:with-param name="node" select="ancestor-or-self::reference[1]"/>
</xsl:call-template>
@@ -610,7 +768,7 @@
</xsl:template>
<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.font.family}">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.font.family}" text-align="center">
<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
@@ -680,7 +838,18 @@
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
</xsl:call-template></fo:block>
- <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="(dedicationinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="dedicationinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="dedication.titlepage.verso">
@@ -728,17 +897,38 @@
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
</xsl:call-template></fo:block>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="(prefaceinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="prefaceinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="preface.titlepage.verso">
@@ -842,18 +1032,50 @@
</xsl:template>
<xsl:template name="chapter.titlepage.recto">
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="(chapterinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="(chapterinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="chapterinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="chapterinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="chapter.titlepage.verso">
@@ -965,18 +1187,50 @@
</xsl:template>
<xsl:template name="appendix.titlepage.recto">
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="(appendixinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="(appendixinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="appendixinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="appendixinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="appendix.titlepage.verso">
@@ -1088,8 +1342,24 @@
</xsl:template>
<xsl:template name="section.titlepage.recto">
- <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="(sectioninfo/title|title)[1]"/>
- <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="(sectioninfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sectioninfo/title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sectioninfo/subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
@@ -1209,8 +1479,24 @@
</xsl:template>
<xsl:template name="sect1.titlepage.recto">
- <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="(sect1info/title|title)[1]"/>
- <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="(sect1info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect1info/title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect1info/subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
@@ -1330,8 +1616,24 @@
</xsl:template>
<xsl:template name="sect2.titlepage.recto">
- <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="(sect2info/title|title)[1]"/>
- <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="(sect2info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect2info/title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect2info/subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
@@ -1451,8 +1753,24 @@
</xsl:template>
<xsl:template name="sect3.titlepage.recto">
- <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="(sect3info/title|title)[1]"/>
- <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="(sect3info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect3info/title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect3info/subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
@@ -1572,8 +1890,24 @@
</xsl:template>
<xsl:template name="sect4.titlepage.recto">
- <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="(sect4info/title|title)[1]"/>
- <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="(sect4info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect4info/title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect4info/subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
@@ -1693,8 +2027,24 @@
</xsl:template>
<xsl:template name="sect5.titlepage.recto">
- <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="(sect5info/title|title)[1]"/>
- <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="(sect5info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect5info/title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect5info/subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
@@ -1814,18 +2164,50 @@
</xsl:template>
<xsl:template name="simplesect.titlepage.recto">
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="(simplesectinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="(simplesectinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="simplesect.titlepage.verso">
@@ -1939,7 +2321,18 @@
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
</xsl:call-template></fo:block>
- <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="(bibliographyinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="bibliographyinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="bibliography.titlepage.verso">
@@ -1985,9 +2378,20 @@
<xsl:template name="glossary.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="-4pc" font-size="17.28pt" font-family="{$title.font.family}" font-weight="bold">
<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
+<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
</xsl:call-template></fo:block>
- <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="(glossaryinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="glossaryinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="glossary.titlepage.verso">
@@ -2033,9 +2437,20 @@
<xsl:template name="index.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="-4pc" font-size="17.28pt" font-family="{$title.font.family}" font-weight="bold">
<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
+<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
</xsl:call-template></fo:block>
- <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="(indexinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="indexinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="index.titlepage.verso">
@@ -2080,8 +2495,8 @@
<xsl:template name="table.of.contents.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'TableofContents'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'TableofContents'"/>
</xsl:call-template></fo:block>
</xsl:template>
@@ -2121,8 +2536,8 @@
<xsl:template name="list.of.tables.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'ListofTables'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'ListofTables'"/>
</xsl:call-template></fo:block>
</xsl:template>
@@ -2162,8 +2577,8 @@
<xsl:template name="list.of.figures.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'ListofFigures'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'ListofFigures'"/>
</xsl:call-template></fo:block>
</xsl:template>
@@ -2203,8 +2618,8 @@
<xsl:template name="list.of.examples.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'ListofExamples'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'ListofExamples'"/>
</xsl:call-template></fo:block>
</xsl:template>
@@ -2244,8 +2659,8 @@
<xsl:template name="list.of.equations.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'ListofEquations'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'ListofEquations'"/>
</xsl:call-template></fo:block>
</xsl:template>
@@ -2285,8 +2700,8 @@
<xsl:template name="list.of.unknowns.titlepage.recto">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="{$title.font.family}">
-<xsl:call-template name="gentext.element.name">
-<xsl:with-param name="element.name" select="'ListofUnknown'"/>
+<xsl:call-template name="gentext">
+<xsl:with-param name="key" select="'ListofUnknown'"/>
</xsl:call-template></fo:block>
</xsl:template>
diff --git a/tests/docbook/fo/titlepage.xsl b/tests/docbook/fo/titlepage.xsl
index 60dcb7b5..dd336677 100644
--- a/tests/docbook/fo/titlepage.xsl
+++ b/tests/docbook/fo/titlepage.xsl
@@ -134,19 +134,7 @@
<xsl:if test="title"> <!-- FIXME: add param for using default title? -->
<xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title"
- mode="titlepage.abstract.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">
- <xsl:value-of select="name(.)"/>
- </xsl:with-param>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
</xsl:if>
@@ -166,7 +154,9 @@
</xsl:template>
<xsl:template match="affiliation" mode="titlepage.mode">
- <xsl:apply-templates mode="titlepage.mode"/>
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
</xsl:template>
<xsl:template match="artpagenums" mode="titlepage.mode">
@@ -203,7 +193,25 @@
</xsl:template>
<xsl:template match="confgroup" mode="titlepage.mode">
- <xsl:apply-templates mode="titlepage.mode"/>
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="confdates" mode="titlepage.mode">
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="conftitle" mode="titlepage.mode">
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
+</xsl:template>
+
+<xsl:template match="confnum" mode="titlepage.mode">
+ <!-- suppress -->
</xsl:template>
<xsl:template match="contractnum" mode="titlepage.mode">
@@ -222,7 +230,9 @@
<xsl:variable name="years" select="year"/>
<xsl:variable name="holders" select="holder"/>
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Copyright'"/>
+ </xsl:call-template>
<xsl:call-template name="gentext.space"/>
<xsl:call-template name="dingbat">
<xsl:with-param name="dingbat">copyright</xsl:with-param>
@@ -231,8 +241,6 @@
<xsl:apply-templates select="$years" mode="titlepage.mode"/>
<xsl:if test="holder">
<xsl:call-template name="gentext.space"/>
- <xsl:call-template name="gentext.by"/>
- <xsl:call-template name="gentext.space"/>
<xsl:apply-templates select="$holders" mode="titlepage.mode"/>
</xsl:if>
</xsl:template>
@@ -263,8 +271,10 @@
<xsl:template match="edition" mode="titlepage.mode">
<xsl:apply-templates mode="titlepage.mode"/>
- <xsl:text> </xsl:text>
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Edition'"/>
+ </xsl:call-template>
</xsl:template>
<xsl:template match="editor" mode="titlepage.mode">
@@ -310,7 +320,9 @@
</xsl:template>
<xsl:template match="jobtitle" mode="titlepage.mode">
- <xsl:apply-templates mode="titlepage.mode"/>
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
</xsl:template>
<xsl:template match="keywordset" mode="titlepage.mode">
@@ -319,21 +331,9 @@
<xsl:template match="legalnotice" mode="titlepage.mode">
<fo:block>
<xsl:if test="title"> <!-- FIXME: add param for using default title? -->
- <xsl:call-template name="formal.object.heading">
+ <xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:choose>
- <xsl:when test="title">
- <xsl:apply-templates select="title"
- mode="legalnotice.abstract.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">
- <xsl:value-of select="name(.)"/>
- </xsl:with-param>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
</xsl:if>
@@ -361,7 +361,9 @@
</xsl:template>
<xsl:template match="orgname" mode="titlepage.mode">
- <xsl:apply-templates mode="titlepage.mode"/>
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
</xsl:template>
<xsl:template match="othercredit" mode="titlepage.mode">
@@ -393,6 +395,12 @@
<xsl:apply-templates mode="titlepage.mode"/>
</xsl:template>
+<xsl:template match="publisher" mode="titlepage.mode">
+ <fo:block>
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </fo:block>
+</xsl:template>
+
<xsl:template match="publishername" mode="titlepage.mode">
<xsl:apply-templates mode="titlepage.mode"/>
</xsl:template>
@@ -414,7 +422,9 @@
<fo:table-row>
<fo:table-cell number-columns-spanned="3">
<fo:block>
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'RevHistory'"/>
+ </xsl:call-template>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -432,8 +442,10 @@
<fo:table-cell>
<fo:block>
<xsl:if test="$revnumber">
- <xsl:call-template name="gentext.element.name"/>
- <xsl:text> </xsl:text>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Revision'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
<xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
</xsl:if>
</fo:block>
@@ -598,7 +610,7 @@
<xsl:template match="authorgroup/corpauthor" mode="book.titlepage.verso.mode">
<xsl:variable name="before" select="count(preceding-sibling::*)"/>
- <xsl:variable name="after" select="count(preceding-sibling::*)"/>
+ <xsl:variable name="after" select="count(following-sibling::*)"/>
<xsl:choose>
<xsl:when test="$before &gt; 1">
@@ -609,7 +621,7 @@
</xsl:when>
</xsl:choose>
- <xsl:if test="$after = 0">
+ <xsl:if test="$after = 0 and $before &gt; 0">
<xsl:text> </xsl:text>
<xsl:call-template name="gentext">
<xsl:with-param name="key" select="'and'"/>
@@ -636,7 +648,7 @@
<!-- part recto -->
<xsl:template match="title" mode="part.titlepage.recto.mode">
- <xsl:apply-templates select="ancestor::part" mode="title.ref"/>
+ <xsl:apply-templates select="ancestor::part" mode="title.markup"/>
</xsl:template>
<!-- ==================================================================== -->
diff --git a/tests/docbook/fo/toc.xsl b/tests/docbook/fo/toc.xsl
index ea8c93fc..3893ccb3 100644
--- a/tests/docbook/fo/toc.xsl
+++ b/tests/docbook/fo/toc.xsl
@@ -15,7 +15,197 @@
<!-- ==================================================================== -->
+<!-- FIXME: in the contexts where <toc> can occur, I think it's always
+ the case that a page-sequence is required. Is that true? -->
+
<xsl:template match="toc">
+ <xsl:variable name="master-name">
+ <xsl:call-template name="select.pagemaster"/>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="*">
+ <xsl:if test="$process.source.toc != 0">
+ <!-- if the toc isn't empty, process it -->
+ <fo:page-sequence hyphenate="{$hyphenate}"
+ master-name="{$master-name}">
+ <xsl:attribute name="language">
+ <xsl:call-template name="l10n.language"/>
+ </xsl:attribute>
+ <xsl:if test="$double.sided != 0">
+ <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
+ </xsl:if>
+
+ <xsl:apply-templates select="." mode="running.head.mode">
+ <xsl:with-param name="master-name" select="$master-name"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="." mode="running.foot.mode">
+ <xsl:with-param name="master-name" select="$master-name"/>
+ </xsl:apply-templates>
+
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block xsl:use-attribute-sets="toc.margin.properties">
+ <xsl:call-template name="table.of.contents.titlepage"/>
+ <xsl:apply-templates/>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$process.empty.source.toc != 0">
+ <fo:page-sequence hyphenate="{$hyphenate}"
+ master-name="{$master-name}">
+ <xsl:attribute name="language">
+ <xsl:call-template name="l10n.language"/>
+ </xsl:attribute>
+ <xsl:if test="$double.sided != 0">
+ <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
+ </xsl:if>
+
+ <xsl:apply-templates select="." mode="running.head.mode">
+ <xsl:with-param name="master-name" select="$master-name"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="." mode="running.foot.mode">
+ <xsl:with-param name="master-name" select="$master-name"/>
+ </xsl:apply-templates>
+
+ <fo:flow flow-name="xsl-region-body">
+ <xsl:choose>
+ <xsl:when test="parent::section
+ or parent::sect1
+ or parent::sect2
+ or parent::sect3
+ or parent::sect4
+ or parent::sect5">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.section"/>
+ </xsl:when>
+ <xsl:when test="parent::article">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.component"/>
+ </xsl:when>
+ <xsl:when test="parent::book
+ or parent::part">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.division"/>
+ </xsl:when>
+ <xsl:when test="parent::set">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.set"/>
+ </xsl:when>
+ <!-- there aren't any other contexts that allow toc -->
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:flow>
+ </fo:page-sequence>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="tocpart|tocchap
+ |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
+ <xsl:apply-templates select="tocentry"/>
+ <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
+ <fo:block start-indent="{count(ancestor::*)*2}pc">
+ <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
+ </fo:block>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="tocentry|tocfront|tocback">
+ <fo:block text-align-last="justify"
+ end-indent="2pc"
+ last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">
+ <xsl:choose>
+ <xsl:when test="@linkend">
+ <fo:basic-link internal-destination="{@linkend}">
+ <xsl:apply-templates/>
+ </fo:basic-link>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:inline>
+
+ <xsl:choose>
+ <xsl:when test="@linkend">
+ <fo:inline keep-together.within-line="always">
+ <xsl:text> </xsl:text>
+ <fo:leader leader-pattern="dots"
+ keep-with-next.within-line="always"/>
+ <xsl:text> </xsl:text>
+ <fo:basic-link internal-destination="{@linkend}">
+ <xsl:choose>
+ <xsl:when test="@pagenum">
+ <xsl:value-of select="@pagenum"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:page-number-citation ref-id="{@linkend}"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:basic-link>
+ </fo:inline>
+ </xsl:when>
+ <xsl:when test="@pagenum">
+ <fo:inline keep-together.within-line="always">
+ <xsl:text> </xsl:text>
+ <fo:leader leader-pattern="dots"
+ keep-with-next.within-line="always"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="@pagenum"/>
+ </fo:inline>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- just the leaders, what else can I do? -->
+ <fo:inline keep-together.within-line="always">
+ <xsl:text> </xsl:text>
+ <fo:leader leader-pattern="space"
+ keep-with-next.within-line="always"/>
+ </fo:inline>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:block>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="*" mode="toc.for.section">
+<!--
+ <xsl:call-template name="section.toc"/>
+-->
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.component">
+ <xsl:call-template name="component.toc"/>
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.section">
+<!--
+ <xsl:call-template name="section.toc"/>
+-->
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.division">
+ <xsl:call-template name="division.toc"/>
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.set">
+<!--
+ <xsl:call-template name="set.toc"/>
+-->
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="lot|lotentry">
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/fo/verbatim.xsl b/tests/docbook/fo/verbatim.xsl
index 4e9028ff..ce8d4f6a 100644
--- a/tests/docbook/fo/verbatim.xsl
+++ b/tests/docbook/fo/verbatim.xsl
@@ -1,9 +1,10 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:verb5="http://nwalsh.com/com.nwalsh.saxon.Verbatim"
- xmlns:verb6="http://nwalsh.com/com.nwalsh.saxon6.Verbatim"
- exclude-result-prefixes="verb5 verb6"
+ xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
+ xmlns:xverb="com.nwalsh.xalan.Verbatim"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="sverb xverb lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -16,57 +17,19 @@
******************************************************************** -->
+<lxslt:component prefix="xverb"
+ functions="numberLines"/>
+
<xsl:template match="programlisting|screen">
<xsl:param name="suppress-numbers" select="'0'"/>
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
- <!-- Obey the <?dbfo linenumbering.everyNth="x"?> PI -->
- <xsl:variable name="default.linenumbering.everyNth"
- select="$linenumbering.everyNth"/>
-
- <xsl:variable name="pi.linenumbering.everyNth">
- <xsl:call-template name="dbfo-attribute">
- <xsl:with-param name="attribute" select="'everyNth'"/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="linenumbering.everyNth">
- <xsl:choose>
- <xsl:when test="$pi.linenumbering.everyNth != ''">
- <xsl:value-of select="$pi.linenumbering.everyNth"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$default.linenumbering.everyNth"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <!-- Obey the <?dbfo linenumbering.separator="x"?> PI -->
- <xsl:variable name="default.linenumbering.separator"
- select="$linenumbering.separator"/>
-
- <xsl:variable name="pi.linenumbering.separator">
- <xsl:call-template name="dbfo-attribute">
- <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="linenumbering.separator">
- <xsl:choose>
- <xsl:when test="$pi.linenumbering.separator != ''">
- <xsl:value-of select="$pi.linenumbering.separator"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$default.linenumbering.separator"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<xsl:variable name="rtf">
<xsl:apply-templates/>
</xsl:variable>
@@ -74,21 +37,10 @@
text-align='start'
white-space-collapse='false'
linefeed-treatment="preserve"
- font-family='{$monospace.font.family}'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ xsl:use-attribute-sets="monospace.verbatim.properties">
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</fo:block>
</xsl:when>
<xsl:otherwise>
@@ -96,10 +48,7 @@
text-align='start'
white-space-collapse='false'
linefeed-treatment="preserve"
- font-family='{$monospace.font.family}'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
+ xsl:use-attribute-sets="monospace.verbatim.properties">
<xsl:apply-templates/>
</fo:block>
</xsl:otherwise>
@@ -117,29 +66,18 @@
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<xsl:choose>
<xsl:when test="@class='monospaced'">
<fo:block wrap-option='no-wrap'
text-align='start'
linefeed-treatment="preserve"
- font-family='{$monospace.font.family}'
white-space-collapse='false'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ xsl:use-attribute-sets="monospace.verbatim.properties">
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</fo:block>
</xsl:when>
<xsl:otherwise>
@@ -147,20 +85,10 @@
text-align='start'
linefeed-treatment="preserve"
white-space-collapse='false'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ xsl:use-attribute-sets="verbatim.properties">
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</fo:block>
</xsl:otherwise>
</xsl:choose>
@@ -170,12 +98,9 @@
<xsl:when test="@class='monospaced'">
<fo:block wrap-option='no-wrap'
text-align='start'
- font-family='{$monospace.font.family}'
linefeed-treatment="preserve"
white-space-collapse='false'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
+ xsl:use-attribute-sets="monospace.verbatim.properties">
<xsl:copy-of select="$rtf"/>
</fo:block>
</xsl:when>
@@ -184,9 +109,7 @@
text-align='start'
linefeed-treatment="preserve"
white-space-collapse='false'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
+ xsl:use-attribute-sets="verbatim.properties">
<xsl:copy-of select="$rtf"/>
</fo:block>
</xsl:otherwise>
@@ -206,26 +129,15 @@
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<fo:block wrap-option='no-wrap'
- text-align='start'
white-space-collapse='false'
linefeed-treatment="preserve"
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ xsl:use-attribute-sets="verbatim.properties">
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</fo:block>
</xsl:when>
<xsl:otherwise>
@@ -233,13 +145,102 @@
text-align='start'
linefeed-treatment="preserve"
white-space-collapse='false'
- space-before.minimum="0.8em"
- space-before.optimum="1em"
- space-before.maximum="1.2em">
+ xsl:use-attribute-sets="verbatim.properties">
<xsl:apply-templates/>
</fo:block>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+<xsl:template name="number.rtf.lines">
+ <xsl:param name="rtf" select="''"/>
+ <xsl:param name="pi.context" select="."/>
+
+ <!-- Save the global values -->
+ <xsl:variable name="global.linenumbering.everyNth"
+ select="$linenumbering.everyNth"/>
+
+ <xsl:variable name="global.linenumbering.separator"
+ select="$linenumbering.separator"/>
+
+ <xsl:variable name="global.linenumbering.width"
+ select="$linenumbering.width"/>
+
+ <!-- Extract the <?dbfo linenumbering.*?> PI values -->
+ <xsl:variable name="pi.linenumbering.everyNth">
+ <xsl:call-template name="dbfo-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbfo')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:variable name="pi.linenumbering.separator">
+ <xsl:call-template name="dbfo-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbfo')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:variable name="pi.linenumbering.width">
+ <xsl:call-template name="dbfo-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbfo')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- Construct the 'in-context' values -->
+ <xsl:variable name="linenumbering.everyNth">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.everyNth != ''">
+ <xsl:value-of select="$pi.linenumbering.everyNth"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.everyNth"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="linenumbering.separator">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.separator != ''">
+ <xsl:value-of select="$pi.linenumbering.separator"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.separator"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="linenumbering.width">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.width != ''">
+ <xsl:value-of select="$pi.linenumbering.width"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.width"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON ')">
+ <xsl:copy-of select="sverb:numberLines($rtf)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xverb:numberLines($rtf)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do line numbering with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/tests/docbook/fo/xref.xsl b/tests/docbook/fo/xref.xsl
index 5451718c..28630e3f 100644
--- a/tests/docbook/fo/xref.xsl
+++ b/tests/docbook/fo/xref.xsl
@@ -15,6 +15,14 @@
<!-- ==================================================================== -->
+<xsl:template match="anchor">
+ <!-- FIXME: should this output an empty element with an ID? -->
+ <!-- what element!? -->
+ <!-- suppress -->
+</xsl:template>
+
+<!-- ==================================================================== -->
+
<xsl:template match="xref">
<xsl:variable name="targets" select="id(@linkend)"/>
<xsl:variable name="target" select="$targets[1]"/>
@@ -34,7 +42,8 @@
</xsl:when>
<xsl:when test="$target/@xreflabel">
- <fo:basic-link internal-destination="{@linkend}">
+ <fo:basic-link internal-destination="{@linkend}"
+ xsl:use-attribute-sets="xref.properties">
<xsl:call-template name="xref.xreflabel">
<xsl:with-param name="target" select="$target"/>
</xsl:call-template>
@@ -42,7 +51,8 @@
</xsl:when>
<xsl:otherwise>
- <fo:basic-link internal-destination="{@linkend}">
+ <fo:basic-link internal-destination="{@linkend}"
+ xsl:use-attribute-sets="xref.properties">
<xsl:choose>
<xsl:when test="@endterm">
<xsl:variable name="etargets" select="id(@endterm)"/>
@@ -65,157 +75,6 @@
<xsl:otherwise>
<xsl:apply-templates select="$target" mode="xref-to"/>
</xsl:otherwise>
-
-<!--
- <xsl:when test="$refelem='figure'">
- <xsl:call-template name="xref.figure">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='example'">
- <xsl:call-template name="xref.example">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='table'">
- <xsl:call-template name="xref.table">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='equation'">
- <xsl:call-template name="xref.equation">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='cmdsynopsis'">
- <xsl:call-template name="xref.cmdsynopsis">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='funcsynopsis'">
- <xsl:call-template name="xref.funcsynopsis">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='dedication'">
- <xsl:call-template name="xref.dedication">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='preface'">
- <xsl:call-template name="xref.preface">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='chapter'">
- <xsl:call-template name="xref.chapter">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='appendix'">
- <xsl:call-template name="xref.appendix">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='bibliography'">
- <xsl:call-template name="xref.bibliography">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='biblioentry'">
- <xsl:call-template name="xref.biblioentry">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='bibliomixed'">
- <xsl:call-template name="xref.biblioentry">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='glossary'">
- <xsl:call-template name="xref.glossary">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='index'">
- <xsl:call-template name="xref.index">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='section'
- or $refelem='simplesect'
- or $refelem='sect1'
- or $refelem='sect2'
- or $refelem='sect3'
- or $refelem='sect4'
- or $refelem='sect5'
- or $refelem='refsect1'
- or $refelem='refsect2'
- or $refelem='refsect3'">
- <xsl:call-template name="xref.section">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='listitem'
- and name($target/..)='orderedlist'">
- <xsl:apply-templates select="$target" mode="xref"/>
- </xsl:when>
-
- <xsl:when test="$refelem='question'">
- <xsl:call-template name="xref.question">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='answer'">
- <xsl:call-template name="xref.answer">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='part'">
- <xsl:call-template name="xref.part">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='reference'">
- <xsl:call-template name="xref.reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='book'">
- <xsl:call-template name="xref.book">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:message>
- <xsl:text>[Don't know what gentext to create for xref to: "</xsl:text>
- <xsl:value-of select="$refelem"/>
- <xsl:text>"]</xsl:text>
- </xsl:message>
- <xsl:text>???</xsl:text>
- </xsl:otherwise>
--->
</xsl:choose>
</fo:basic-link>
</xsl:otherwise>
@@ -224,149 +83,72 @@
<!--- ==================================================================== -->
-<xsl:template name="cross-reference">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
- <xsl:param name="xref.text">
- <xsl:call-template name="gentext.xref.text">
- <xsl:with-param name="element.name" select="$refelem"/>
- <xsl:with-param name="default">%g %n</xsl:with-param>
- </xsl:call-template>
- </xsl:param>
-
- <xsl:call-template name="subst.xref.text">
- <xsl:with-param name="xref.text" select="$xref.text"/>
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
-</xsl:template>
-
<xsl:template match="*" mode="xref-to">
<xsl:param name="target" select="."/>
<xsl:param name="refelem" select="local-name($target)"/>
<xsl:message>
- <xsl:text>[Don't know what gentext to create for xref to: "</xsl:text>
+ <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
<xsl:value-of select="$refelem"/>
- <xsl:text>"]</xsl:text>
+ <xsl:text>"</xsl:text>
</xsl:message>
<xsl:text>???</xsl:text>
</xsl:template>
<xsl:template match="author" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
<xsl:call-template name="person.name"/>
</xsl:template>
<xsl:template match="figure" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="example" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="table" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="equation" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="cmdsynopsis" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:variable name="command" select="($target//command)[1]"/>
-
- <xsl:apply-templates select="$command" mode="xref"/>
+ <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
</xsl:template>
<xsl:template match="funcsynopsis" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:variable name="func" select="($target//function)[1]"/>
-
- <xsl:apply-templates select="$func" mode="xref"/>
+ <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
</xsl:template>
<xsl:template match="dedication" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="preface" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="chapter" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="appendix" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="bibliography" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
<!-- handles both biblioentry and bibliomixed -->
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
<xsl:text>[</xsl:text>
<xsl:choose>
- <xsl:when test="local-name($target/*[1]) = 'abbrev'">
- <xsl:apply-templates select="$target/*[1]"/>
+ <xsl:when test="local-name(*[1]) = 'abbrev'">
+ <xsl:apply-templates select="*[1]"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@id"/>
@@ -376,116 +158,42 @@
</xsl:template>
<xsl:template match="glossary" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="index" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="section|simplesect
|sect1|sect2|sect3|sect4|sect5
|refsect1|refsect2|refsect3" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:choose>
- <xsl:when test="$section.autolabel">
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="$refelem"/>
- </xsl:call-template>
- <xsl:text> </xsl:text>
- <xsl:apply-templates select="$target" mode="label.content"/>
-
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">the section called</xsl:with-param>
- </xsl:call-template>
- <xsl:text> </xsl:text>
- <xsl:call-template name="gentext.startquote"/>
- <xsl:apply-templates select="$target" mode="title.content"/>
- <xsl:call-template name="gentext.endquote"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
+ <!-- What about "in Chapter X"? -->
</xsl:template>
<xsl:template match="question" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="answer" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="part" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="reference" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="co" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
- <xsl:apply-templates select="$target" mode="callout-bug"/>
-</xsl:template>
-
-<xsl:template match="co" mode="conumber">
- <xsl:number from="literallayout|programlisting|screen|synopsis"
- level="single"
- format="1"/>
+ <xsl:apply-templates select="." mode="callout-bug"/>
</xsl:template>
<xsl:template match="book" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:variable name="title">
- <xsl:choose>
- <xsl:when test="$target/title">
- <xsl:apply-templates select="$target/title" mode="xref"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="$target/bookinfo/title"
- mode="xref"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <fo:inline font-style="italic">
- <xsl:copy-of select="$title"/>
- </fo:inline>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<!-- ==================================================================== -->
@@ -498,13 +206,15 @@
<xsl:with-param name="linkend" select="@linkend"/>
</xsl:call-template>
- <fo:basic-link internal-destination="{@linkend}">
+ <fo:basic-link internal-destination="{@linkend}"
+ xsl:use-attribute-sets="xref.properties">
<xsl:apply-templates/>
</fo:basic-link>
</xsl:template>
<xsl:template match="ulink">
- <fo:basic-link external-destination="{@url}">
+ <fo:basic-link external-destination="{@url}"
+ xsl:use-attribute-sets="xref.properties">
<xsl:choose>
<xsl:when test="count(child::node())=0">
<xsl:value-of select="@url"/>
@@ -515,9 +225,11 @@
</xsl:choose>
</fo:basic-link>
<xsl:if test="count(child::node()) != 0">
- <xsl:text> [</xsl:text>
- <xsl:value-of select="@url"/>
- <xsl:text>]</xsl:text>
+ <fo:inline hyphenate="false">
+ <xsl:text> [</xsl:text>
+ <xsl:value-of select="@url"/>
+ <xsl:text>]</xsl:text>
+ </fo:inline>
</xsl:if>
</xsl:template>
@@ -542,12 +254,12 @@
or local-name($target) = 'setindex'
or local-name($target) = 'colophon'">
<xsl:call-template name="gentext.startquote"/>
- <xsl:apply-templates select="$target" mode="title.content"/>
+ <xsl:apply-templates select="$target" mode="title.markup"/>
<xsl:call-template name="gentext.endquote"/>
</xsl:when>
<xsl:otherwise>
<fo:inline font-style="italic">
- <xsl:apply-templates select="$target" mode="title.content"/>
+ <xsl:apply-templates select="$target" mode="title.markup"/>
</fo:inline>
</xsl:otherwise>
</xsl:choose>
@@ -555,7 +267,7 @@
<xsl:template name="number.xref">
<xsl:param name="target" select="."/>
- <xsl:apply-templates select="$target" mode="label.content"/>
+ <xsl:apply-templates select="$target" mode="label.markup"/>
</xsl:template>
<!-- ==================================================================== -->
@@ -582,4 +294,20 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+<xsl:template name="insert.page.citation">
+ <xsl:param name="id" select="'???'"/>
+ <xsl:if test="$insert.xref.page.number">
+ <xsl:text> </xsl:text>
+ <fo:inline keep-together.within-line="always">
+ <xsl:text>[</xsl:text>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'page.citation'"/>
+ </xsl:call-template>
+ <xsl:text> </xsl:text>
+ <fo:page-number-citation ref-id="{$id}"/>
+ <xsl:text>]</xsl:text>
+ </fo:inline>
+ </xsl:if>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/tests/docbook/html/ChangeLog b/tests/docbook/html/ChangeLog
index f43e3b5d..f8c67562 100644
--- a/tests/docbook/html/ChangeLog
+++ b/tests/docbook/html/ChangeLog
@@ -1,259 +1,173 @@
-2001-01-30 Norman Walsh <ndw@nwalsh.com>
+2001-06-13 Norman Walsh <nwalsh@users.sourceforge.net>
- * autotoc.xsl: Added support for section TOCs and refentrys in components
+ * chunk-common.xsl: Make sure the root element gets processed correctly so that it generates the right titlepage
- * index.xsl: Proper support for grouping symbol entries in the index. Thanks again Jeni.
+ * component.xsl: Don't output ID attributes on DIVs with required titles since they conflict with the NAME attributes on the subsequently output A tags.
- * lists.xsl: Added summary attribute to simplelist tables
+ * docbook.xsl: Pass the current node to user.head.content
- * param.xsl, sections.xsl: Added support for section TOCs
+ * index.xsl: Updated comment
-2001-01-28 Norman Walsh <ndw@nwalsh.com>
+2001-06-07 Jirka Kosek <kosek@users.sourceforge.net>
- * autotoc.xsl, index.xsl: Support automatic indexing
+ * lists.xsl: Things preceding steps in procedure are placed before OL list.
- * biblio.xsl: Support shortaffil and jobtitle in bibliomixed
+2001-06-04 Norman Walsh <nwalsh@users.sourceforge.net>
- * component.xsl: Allow anchors in component titles
+ * lists.xsl: Fixed typo in compact list support; backed out procedure step changes
- * division.xsl: Support ToCs and PartIntros in References
+ * sections.xsl: Fixed CSS typo; clear: all should be clear: both
- * graphics.xsl: Process mediaobjectco and imageobjectco (just do the graphic, ignore the callouts)
+2001-06-02 Jirka Kosek <kosek@users.sourceforge.net>
- * inline.xsl: Fix precedence bug processing of function params
+ * lists.xsl: Fixed bug #424926. Things preceding steps in procedure are not placed inside OL list.
- * param.xsl: Added generate.reference.toc and generate.index
+2001-05-23 Norman Walsh <nwalsh@users.sourceforge.net>
- * refentry.xsl: Handle Reference ToC correctly
+ * component.xsl: Reorganized templates for clarity
- * sections.xsl: Allow anchors in section titles
+ * graphics.xsl: Fix dup. template bug with is.graphic.*
- * synop.xsl, verbatim.xsl: Handle synopsis as a proper verbatim environment
+ * titlepage.xsl: Added template for publisher
-2001-01-12 Norman Walsh <ndw@nwalsh.com>
+2001-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
- * admon.xsl, param.xsl: Added admon.graphics.extension parameter
+ * autotoc.xsl: Make the TOC label/title separator a parameter
- * docbook.xsl: (Attempt) to fix bug with root node context
+ * callout.xsl, verbatim.xsl: Move calculation of linenumber.* parameters into the number.rtf.lines template
- * footnote.xsl: Improve handling of footnote links
+ * changebars.xsl: Add link and member as inlines
- * keywords.xsl: Make a single META header with a comma-delimited list of keywords, instead of a set of META headers
+ * sections.xsl: Refactor the section title code
- * table.xsl: Add anchors for ROW and ENTRY IDs
+ * titlepage.templates.xml: Reworked titlepage template processing to support use of more interesting
+ predicates.
+
+ Note: in previous versions, at most one title, subtitle, or titleabbrev
+ element would be processed for each title page. In the new design, if you
+ have multiple title, subtitle, or titleabbrev elements inside an info
+ wrapper (you shouldn't!), they will all be processed.
-2001-01-07 Norman Walsh <ndw@nwalsh.com>
+2001-05-13 Norman Walsh <nwalsh@users.sourceforge.net>
- * component.xsl, division.xsl, titlepage.templates.xml, titlepage.xsl:
- Updated to use new parameters and new titlepage formatting
+ * param.xsl: Fixed ID typo
- * param.xsl: Added new parameters for controlling TOCs
+ * synop.xsl: Fixed synopfragmentref link (suggested by Philippe Martin)
- * titlepage.templates.xsl: Updated
+2001-05-12 Norman Walsh <nwalsh@users.sourceforge.net>
- * xref.xsl: Added support for xref to author
+ * autotoc.xsl, param.xsl: Mostly failed attempt to add bridgeheads to the automatic TOC; this option is turned off by default and you should leave it that way.
-2000-12-14 Norman Walsh <ndw@nwalsh.com>
+ * sections.xsl: Calculate the heading level for bridgeheads
- * param.xsl: Added information about parameter types (for a future web-based customization tool); added new table parameters for Saxon tablecolumn extensions
+2001-05-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * table.xsl: Added support for the Saxon (6-only) table column extension
+ * lists.xsl: Output anchors for procedures and steps
-2000-11-29 Norman Walsh <ndw@nwalsh.com>
+ * table.xsl: Process head/body/foot in the right order
- * admon.xsl: Use PNGs for admonition graphics
+2001-04-29 Norman Walsh <nwalsh@users.sourceforge.net>
- * block.xsl: Hack for putting anchors in list items
+ * chunk-common.xsl, chunk.xsl, xtchunk.xsl: Automatically make an index when chunking with a processor other than XT
- * callout.xsl, graphics.xsl, verbatim.xsl: Updated to use Saxon 6 extensions
+2001-04-26 Norman Walsh <nwalsh@users.sourceforge.net>
- * docbook.xsl: Whitespace changes
+ * changebars.xsl: Support a few more elements
- * lists.xsl: Hack to fix anchors in list items
+ * inline.xsl: Make glossterms hot if they're links. And make them italic.
- * param.xsl: Added stylesheet.result.type for the Saxon extensions
+ * lists.xsl: Improve procedure step/substep enumeration
- * pi.xsl: Only output the dbhtml PI if we're using.chunker
+2001-04-24 Norman Walsh <nwalsh@users.sourceforge.net>
- * sections.xsl: Remove IDs from divs; we also generate anchors and it's wrong to generate both with the same ID value
+ * chunk-common.xsl: Feature request 416507: added chunk.sections and chunk.first.sections to provide greater chunking flexibility
- * table.xsl: Improve calculation of starting column number
+ * chunk-common.xsl: Fix chunking bug
- * table.xsl: Support align on tgroup
+ * chunker.xsl: Output ID in message
- * xref.xsl: Support bibliomixed
+ * glossary.xsl: Fix bug that caused duplicated glossary entries
-2000-11-17 Norman Walsh <ndw@nwalsh.com>
+ * qandaset.xsl: Bug #418100: fix qandaentry anchors; also fixed formatting bug in questions with indexterms
- * block.xsl: Added template for highlights
+2001-04-21 Jirka Kosek <kosek@users.sourceforge.net>
- * callout.xsl, lists.xsl: Callout list marks didn't work
+ * chunker.xsl, param.xsl: Added parameters for changing output encoding in chunked HTML
- * docbook.xsl: Fixed bug in calculation of root element
+ * inline.xsl: Improve processing of trademarks
- * pi.xsl, xref.xsl: Reworked processing of xrefs: now a mode instead of named templates
+2001-04-20 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-11-15 Norman Walsh <ndw@nwalsh.com>
+ * inline.xsl: Restoring accidentally deleted citetitle template
- * callout.xsl, graphics.xsl, param.xsl, verbatim.xsl: Saxon extension support for callouts and numbered verbatim environments
+2001-04-18 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-11-13 Norman Walsh <ndw@nwalsh.com>
+ * autoidx.xsl: Fix bug: lowercase and uppercase need to be strings (not element names :-)
- * param.xsl: Whitespace/documentation fixes
+ * inline.xsl, param.xsl: Bug #413982, easy support for man page CGI links on citerefentry
-2000-11-12 Norman Walsh <ndw@nwalsh.com>
+2001-04-17 Norman Walsh <nwalsh@users.sourceforge.net>
- * callout.xsl, lists.xsl: Added support for callout graphics and callout-tables hack
+ * docbook.xsl, param.xsl: Move label.from.part parameter into param.xsl; default it to 0 so that chapters and appendixes are numbered monotonically throughout a book by default. Moved param.xsl up in the include list, just for good measure
- * chunk-common.xsl: Move write.chunk out of common; support rootid
+2001-04-16 Norman Walsh <nwalsh@users.sourceforge.net>
- * chunk.xsl: Move write.chunk into chunk.xsl
+ * component.xsl: Fix bug in processing of subtitle content on components
- * docbook.xsl: Support rootid
+ * glossary.xsl, titlepage.templates.xml: Fix formatting of glossarys--things were really broken
- * param.xsl: Added rootid and callout graphics parameters
+ * xref.xsl: Patches Tracker #415439: support title attribute on HTML anchors associated with xrefs
- * refentry.xsl: Don't wrap name anchor around refentry title
+2001-04-15 Norman Walsh <nwalsh@users.sourceforge.net>
- * xref.xsl: Use local-name() instead of name(), support xref to co
+ * chunk-common.xsl: Process footnotes correctly when chunking; add summary attribute to navigation tables
- * xtchunk.xsl: Add support for method and encoding parameters to write.chunk
+ * docbook.xsl: Support inheriting of *info keywords
-2000-11-09 Norman Walsh <ndw@nwalsh.com>
+ * footnote.xsl, sections.xsl: Process footnotes correctly when chunking
- * chunk-common.xsl, chunk.xsl, xtchunk.xsl: Reworked chunking to support XT, Xalan, and Saxon
+ * formal.xsl: Use gentext templates for formal object titles
- * param.xsl: Added ulink.target parameter
+ * param.xsl: Added new parameters: inherit.keywords, process.source.toc, and process.empty.source.toc; changed the default for spacing.paras to 0
- * xref.xsl: Support ulink.target
+ * table.xsl: Improve support for align attribute on tgroup
-2000-11-05 Norman Walsh <ndw@nwalsh.com>
+ * toc.xsl: Support DocBook toc markup
- * chunk.xsl: Made base.dir absolute.base.dir; added encoding to saxon:output
+ * xref.xsl: Make a title attribute on HTML anchors for links to things with titles
-2000-11-03 Norman Walsh <ndw@nwalsh.com>
+2001-04-05 Norman Walsh <nwalsh@users.sourceforge.net>
- * chunk.xsl: Fix suppress.navigation problems
+ * table.xsl: Don't translate tgroup align into HTML table align--they don't mean the same thing
- * chunk.xsl: Abstract chunk writing to a write.chunk template
+ * titlepage.xsl: Suppress titleabbrev on the title page
- * sections.xsl: Parameterize wrappers around the parts of a title.ref
+2001-04-04 Norman Walsh <nwalsh@users.sourceforge.net>
-2000-10-30 Norman Walsh <ndw@nwalsh.com>
+ * chunk-common.xsl: Move xsl:message about chunks into the chunker modules
- * chunk.xsl: Fix typos in suppress.navigation
+ * chunker.xsl: Support indent and doctype public/system on chunks (for Saxon, anyway, Xalan's multiple-document extension doesn't seem to support this)
-2000-10-29 Norman Walsh <ndw@nwalsh.com>
+ * xtchunker.xsl: Use xsl:choose to support xml, html, and text output methods
- * autotoc.xsl, division.xsl: Support ToC (for navigation) in Set title pages
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * component.xsl: Don't process footnotes in article apendixes, let the article handle them
+ * callout.xsl: Fix bug 412487, make XSL-generated callout marks honor callout mark parameters
- * footnote.xsl: Superscript the footnote numbers; make space after the hr
+ * chunk-common.xsl: Remove unnecessary xmlns declarations
- * lists.xsl: Cycle numeration of nested ordered lists: 1, a, i, A, I, 1, a, ...
+ * chunker.xsl: Patch to make saxon not produce xml version=1.1 documents
- * sections.xsl: Add template for subtitles
+ * param.xsl: Documentation fixes
- * table.xsl: Reworked colnum calculations to handle some cases where leading entrys are missing in a row; support 'summary' attributes on HTML tables
+ * qandaset.xsl: Apply patch 412510 by Jon Willeke, make xref to Question work correctly
- * titlepage.xsl: If there are no authorinitials; just make revhistorys two columns
+ * xref.xsl: Remove unnecessary parameter assignment
-2000-10-26 Norman Walsh <ndw@nwalsh.com>
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
- * autotoc.xsl: Revised autotoc support; make the HTML valid
-
- * block.xsl: Added some missing IDs; added summary attribute to tables
-
- * changebars.xsl: More tweaks; still largely unfinished
-
- * chunk.xsl, param.xsl: Added suppress.navigation parameter to suppress header and footer navigation tables
-
- * docbook.xsl: Use ISO Latin 1 for output encoding; changed text-node to a 0/1 variable
-
- * graphics.xsl: Fix typos and XLink attribute values
-
- * html.xsl: Support trade, service, and registered dingbats
-
- * html.xsl: Turn off <dingbat> nonsense
-
- * inline.xsl: Don't put <b>'s inside titles that are likely to already be <b>; support trade, service, and registered dingbats
-
- * pi.xsl: Remove needless './'
-
- * sections.xsl: Fix header construction; check css.decoration parameter; don't output <b>'s around normal section titles
-
- * table.xsl: Support 'table-summary' attribute of dbhtml PI inside of tgroup to set the HTML table summary
-
- * titlepage.xsl: Added summary attribute to revision history table
-
- * verbatim.xsl: Figured out how to do non-PRE verbatim display for address and literallayout
-
- * xref.xsl: Fixed messages for bad xrefs
-
-2000-10-20 Norman Walsh <ndw@nwalsh.com>
-
- * Makefile: Use titlepage.xsl to generate title pages
-
- * titlepage.templates.xsl: Regenerated with new stylesheets
-
-2000-10-19 Norman Walsh <ndw@nwalsh.com>
-
- * Makefile, component.xsl, sections.xsl, titlepage.templates.xml, titlepage.templates.xsl:
- Updates to template-driven title pages
-
- * ebnf.xsl, param.xsl: Documentation changes
-
-2000-10-17 Norman Walsh <ndw@nwalsh.com>
-
- * Makefile: New file.
-
- * ebnf.xsl, param.xsl: Updated documentation
-
- * param.xsl: Whitespace
-
- * refentry.xsl: Support referenceinfo; put reference partintro before TOC
-
- * titlepage.xsl: Improved formatting of legal notices
-
-2000-10-16 Norman Walsh <ndw@nwalsh.com>
-
- * chunk.xsl: Fixed prev/next calculations for chapters with multiple sections
-
- * ebnf.xsl, param.xsl: Added doc:reference
-
-2000-10-14 Norman Walsh <ndw@nwalsh.com>
-
- * block.xsl, glossary.xsl, lists.xsl, synop.xsl: Added priority to avoid template conflicts
-
- * chunk.xsl, docbook.xsl: Added user.header.content and user.footer.content
-
- * graphics.xsl: Rewrote support for graphics
-
- * inline.xsl: Added support for role='bold' on emphasis
-
- * titlepage.xsl: Added support for revisionflag on article titles
-
-2000-10-12 Norman Walsh <ndw@nwalsh.com>
-
- * autotoc.xsl: Don't point to empty indexes
-
- * changebars.xsl, lists.xsl, param.xsl: The beginnings of support for changebars
-
- * chunk.xsl: Added base.dir parameter; fixed typo in table cells (widht instead of width attr)
-
- * graphics.xsl: In media objects, always pick the first object if there's only one
-
-2000-10-09 Norman Walsh <ndw@nwalsh.com>
-
- * LostLog, admon.xsl, autotoc.xsl, biblio.xsl, block.xsl, callout.xsl, chunk.xsl, component.xsl, division.xsl, docbook.xsl, ebnf.xsl, footnote.xsl, formal.xsl, glossary.xsl, graphics.xsl, html.xsl, index.xsl, info.xsl, inline.xsl, keywords.xsl, lists.xsl, math.xsl, param.xsl, pi.xsl, qandaset.xsl, refentry.xsl, sections.xsl, synop.xsl, table.xsl, titlepage.templates.xml, titlepage.templates.xsl, titlepage.xsl, toc.xsl, verbatim.xsl, xref.xsl, xtchunk.xsl:
+ * .cvsignore, Makefile, admon.xsl, autoidx.xsl, autotoc.xsl, biblio.xsl, block.xsl, callout.xsl, changebars.xsl, chunk-common.xsl, chunk.xsl, chunker.xsl, component.xsl, division.xsl, docbook.xsl, ebnf.xsl, footnote.xsl, formal.xsl, glossary.xsl, graphics.xsl, html.xsl, index.xsl, info.xsl, inline.xsl, keywords.xsl, lists.xsl, math.xsl, param.xsl, pi.xsl, qandaset.xsl, refentry.xsl, sections.xsl, synop.xsl, table.xsl, titlepage.templates.xml, titlepage.xsl, toc.xsl, verbatim.xsl, xref.xsl, xtchunk.xsl, xtchunker.xsl:
New file.
- * biblio.xsl: Support xref to bibliography entries
-
- * chunk.xsl, docbook.xsl: Turn off indenting
-
- * lists.xsl: Add priority to avoid specificity errors
-
- * xref.xsl: Support xref to bibliography entries; fix broken test for empty ulink
+ * Makefile: Use the cvstools version of saxon
diff --git a/tests/docbook/html/admon.xsl b/tests/docbook/html/admon.xsl
index 234c3a24..09eae16f 100644
--- a/tests/docbook/html/admon.xsl
+++ b/tests/docbook/html/admon.xsl
@@ -12,6 +12,11 @@
******************************************************************** -->
+<xsl:template name="admon.graphic.width">
+ <xsl:param name="node" select="."/>
+ <xsl:text>25</xsl:text>
+</xsl:template>
+
<xsl:template match="note|important|warning|caution|tip">
<xsl:choose>
<xsl:when test="$admon.graphics != 0">
@@ -23,11 +28,6 @@
</xsl:choose>
</xsl:template>
-<xsl:template name="admon.graphic.width">
- <xsl:param name="node" select="."/>
- <xsl:text>25</xsl:text>
-</xsl:template>
-
<xsl:template name="admon.graphic">
<xsl:param name="node" select="."/>
<xsl:value-of select="$admon.graphics.path"/>
@@ -44,7 +44,7 @@
<xsl:template name="graphical.admonition">
<div class="{name(.)}">
- <xsl:if test="$admon.style">
+ <xsl:if test="$admon.style != ''">
<xsl:attribute name="style">
<xsl:value-of select="$admon.style"/>
</xsl:attribute>
@@ -62,20 +62,12 @@
</img>
</td>
<th>
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title"
- mode="graphic.admonition.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="name">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
+ <a>
+ <xsl:attribute name="name">
+ <xsl:call-template name="object.id"/>
+ </xsl:attribute>
+ </a>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
</th>
</tr>
<tr>
@@ -89,28 +81,22 @@
<xsl:template name="nongraphical.admonition">
<div class="{name(.)}">
- <xsl:if test="$admon.style">
- <xsl:attribute name="style">
- <xsl:value-of select="$admon.style"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title" mode="admonition.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <h3 class="title">
- <a>
- <xsl:attribute name="name">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </h3>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:if test="$admon.style">
+ <xsl:attribute name="style">
+ <xsl:value-of select="$admon.style"/>
+ </xsl:attribute>
+ </xsl:if>
+
+ <h3 class="title">
+ <a>
+ <xsl:attribute name="name">
+ <xsl:call-template name="object.id"/>
+ </xsl:attribute>
+ </a>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </h3>
- <xsl:apply-templates/>
+ <xsl:apply-templates/>
</div>
</xsl:template>
diff --git a/tests/docbook/html/autoidx.xsl b/tests/docbook/html/autoidx.xsl
new file mode 100644
index 00000000..27600e58
--- /dev/null
+++ b/tests/docbook/html/autoidx.xsl
@@ -0,0 +1,296 @@
+<?xml version="1.0"?>
+<!DOCTYPE xsl:stylesheet [
+
+<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
+<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
+
+<!ENTITY primary 'concat(primary/@sortas, primary[not(@sortas)])'>
+<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
+<!ENTITY tertiary 'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
+
+<!ENTITY section '(ancestor-or-self::set
+ |ancestor-or-self::book
+ |ancestor-or-self::part
+ |ancestor-or-self::reference
+ |ancestor-or-self::partintro
+ |ancestor-or-self::chapter
+ |ancestor-or-self::appendix
+ |ancestor-or-self::preface
+ |ancestor-or-self::section
+ |ancestor-or-self::sect1
+ |ancestor-or-self::sect2
+ |ancestor-or-self::sect3
+ |ancestor-or-self::sect4
+ |ancestor-or-self::sect5
+ |ancestor-or-self::refsect1
+ |ancestor-or-self::refsect2
+ |ancestor-or-self::refsect3
+ |ancestor-or-self::simplesect
+ |ancestor-or-self::bibliography
+ |ancestor-or-self::glossary
+ |ancestor-or-self::index)[last()]'>
+
+<!ENTITY section.id 'generate-id(&section;)'>
+<!ENTITY sep '" "'>
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="docbook.xsl"/>
+
+<!-- ==================================================================== -->
+<!-- Jeni Tennison gets all the credit for what follows.
+ I think I understand it :-) Anyway, I've hacked it a bit, so the
+ bugs are mine. -->
+
+<xsl:key name="letter"
+ match="indexterm"
+ use="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
+
+<xsl:key name="primary"
+ match="indexterm"
+ use="&primary;"/>
+
+<xsl:key name="secondary"
+ match="indexterm"
+ use="concat(&primary;, &sep;, &secondary;)"/>
+
+<xsl:key name="tertiary"
+ match="indexterm"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
+
+<xsl:key name="primary-section"
+ match="indexterm[not(secondary) and not(see)]"
+ use="concat(&primary;, &sep;, &section.id;)"/>
+
+<xsl:key name="secondary-section"
+ match="indexterm[not(tertiary) and not(see)]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &section.id;)"/>
+
+<xsl:key name="tertiary-section"
+ match="indexterm[not(see)]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, &section.id;)"/>
+
+<xsl:key name="see-also"
+ match="indexterm[seealso]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso)"/>
+
+<xsl:key name="see"
+ match="indexterm[see]"
+ use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/>
+
+<xsl:key name="sections" match="*[@id]" use="@id"/>
+
+<xsl:template name="generate-index">
+ <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
+ translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"/>
+
+ <xsl:variable name="alphabetical"
+ select="$terms[contains(concat(&lowercase;, &uppercase;),
+ substring(&primary;, 1, 1))]"/>
+ <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
+ &uppercase;),
+ substring(&primary;, 1, 1)))]"/>
+ <div class="index">
+ <xsl:if test="$others">
+ <div class="indexdiv">
+ <h3>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'index symbols'"/>
+ </xsl:call-template>
+ </h3>
+ <dl>
+ <xsl:apply-templates select="$others[count(.|key('primary',
+ &primary;)[1]) = 1]"
+ mode="index-primary">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </dl>
+ </div>
+ </xsl:if>
+ <xsl:apply-templates select="$alphabetical[count(.|key('letter',
+ translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"
+ mode="index-div">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </div>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-div">
+ <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
+ <div class="indexdiv">
+ <h3>
+ <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
+ </h3>
+ <dl>
+ <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[1]) = 1]"
+ mode="index-primary">
+ <xsl:sort select="&primary;"/>
+ </xsl:apply-templates>
+ </dl>
+ </div>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-primary">
+ <xsl:variable name="key" select="&primary;"/>
+ <xsl:variable name="refs" select="key('primary', $key)"/>
+ <dt>
+ <xsl:value-of select="primary"/>
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </dt>
+ <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
+ <dd>
+ <dl>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[1]) = 1]"
+ mode="index-secondary">
+ <xsl:sort select="&secondary;"/>
+ </xsl:apply-templates>
+ </dl>
+ </dd>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-secondary">
+ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
+ <xsl:variable name="refs" select="key('secondary', $key)"/>
+ <dt>
+ <xsl:value-of select="secondary"/>
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </dt>
+ <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
+ <dd>
+ <dl>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[1]) = 1]"
+ mode="index-tertiary">
+ <xsl:sort select="&tertiary;"/>
+ </xsl:apply-templates>
+ </dl>
+ </dd>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-tertiary">
+ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
+ <xsl:variable name="refs" select="key('tertiary', $key)"/>
+ <dt>
+ <xsl:value-of select="tertiary"/>
+ <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[1])]">
+ <xsl:apply-templates select="." mode="reference"/>
+ </xsl:for-each>
+ </dt>
+ <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
+ <xsl:if test="$see">
+ <dd>
+ <dl>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[1])]"
+ mode="index-see">
+ <xsl:sort select="see"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[1])]"
+ mode="index-seealso">
+ <xsl:sort select="seealso"/>
+ </xsl:apply-templates>
+ </dl>
+ </dd>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="reference">
+ <xsl:text>, </xsl:text>
+ <xsl:choose>
+ <xsl:when test="@zone and string(@zone)">
+ <xsl:call-template name="reference">
+ <xsl:with-param name="zones" select="normalize-space(@zone)"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <a>
+ <xsl:variable name="title">
+ <xsl:apply-templates select="&section;" mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="object" select="&section;"/>
+ </xsl:call-template>
+ </xsl:attribute>
+
+ <xsl:value-of select="$title"/> <!-- text only -->
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="reference">
+ <xsl:param name="zones"/>
+ <xsl:choose>
+ <xsl:when test="contains($zones, ' ')">
+ <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
+ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="object" select="$target[1]"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
+ </a>
+ <xsl:text>, </xsl:text>
+ <xsl:call-template name="reference">
+ <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="zone" select="$zones"/>
+ <xsl:variable name="target" select="key('sections', $zone)"/>
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="object" select="$target[1]"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-see">
+ <dt><xsl:value-of select="see"/></dt>
+</xsl:template>
+
+<xsl:template match="indexterm" mode="index-seealso">
+ <dt><xsl:value-of select="seealso"/></dt>
+</xsl:template>
+
+<xsl:template match="*" mode="index-title-content">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="&section;" mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/html/autotoc.xsl b/tests/docbook/html/autotoc.xsl
index e4a2204d..0b365d98 100644
--- a/tests/docbook/html/autotoc.xsl
+++ b/tests/docbook/html/autotoc.xsl
@@ -12,6 +12,8 @@
******************************************************************** -->
+<xsl:param name="autotoc.label.separator" select="' '"/>
+
<xsl:template name="href.target">
<xsl:param name="object" select="."/>
<xsl:text>#</xsl:text>
@@ -41,8 +43,8 @@
<div class="toc">
<p>
<b>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">TableofContents</xsl:with-param>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">TableofContents</xsl:with-param>
</xsl:call-template>
</b>
</p>
@@ -57,14 +59,16 @@
<xsl:if test="$generate.division.toc != 0">
<xsl:variable name="nodes" select="part|reference
|preface|chapter|appendix
+ |article
|bibliography|glossary|index
- |refentry"/>
+ |refentry
+ |bridgehead"/>
<xsl:if test="$nodes">
<div class="toc">
<p>
<b>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">TableofContents</xsl:with-param>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">TableofContents</xsl:with-param>
</xsl:call-template>
</b>
</p>
@@ -78,13 +82,16 @@
<xsl:template name="component.toc">
<xsl:if test="$generate.component.toc != 0">
- <xsl:variable name="nodes" select="section|sect1|refentry"/>
+ <xsl:variable name="nodes" select="section|sect1|refentry
+ |article|bibliography|glossary
+ |appendix|bridgehead[not(@renderas)]
+ |.//bridgehead[@renderas='sect1']"/>
<xsl:if test="$nodes">
<div class="toc">
<p>
<b>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">TableofContents</xsl:with-param>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">TableofContents</xsl:with-param>
</xsl:call-template>
</b>
</p>
@@ -97,13 +104,15 @@
</xsl:template>
<xsl:template name="section.toc">
- <xsl:variable name="nodes" select="section|sect1|sect2|sect3|sect4|sect5|refentry"/>
+ <xsl:variable name="nodes"
+ select="section|sect1|sect2|sect3|sect4|sect5|refentry
+ |bridgehead"/>
<xsl:if test="$nodes">
<div class="toc">
<p>
<b>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">TableofContents</xsl:with-param>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">TableofContents</xsl:with-param>
</xsl:call-template>
</b>
</p>
@@ -119,8 +128,10 @@
<xsl:template match="book|setindex" mode="toc">
<xsl:variable name="nodes" select="part|reference
|preface|chapter|appendix
+ |article
|bibliography|glossary|index
- |refentry"/>
+ |refentry
+ |bridgehead"/>
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
@@ -142,13 +153,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>0 and count($nodes)&gt;0">
@@ -161,11 +172,55 @@
</xsl:if>
</xsl:template>
-<xsl:template match="part|reference|preface|chapter|appendix"
- mode="toc">
+<xsl:template match="part|reference" mode="toc">
+ <xsl:variable name="nodes" select="appendix|chapter|article
+ |index|glossary|bibliography
+ |preface|reference|refentry
+ |bridgehead"/>
+
+ <xsl:variable name="subtoc">
+ <xsl:element name="{$toc.list.type}">
+ <xsl:apply-templates select="$nodes" mode="toc"/>
+ </xsl:element>
+ </xsl:variable>
+
+ <xsl:variable name="subtoc.list">
+ <xsl:choose>
+ <xsl:when test="$toc.dd.type = ''">
+ <xsl:copy-of select="$subtoc"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="{$toc.dd.type}">
+ <xsl:copy-of select="$subtoc"/>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:element name="{$toc.listitem.type}">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </a>
+ <xsl:if test="$toc.listitem.type = 'li'
+ and $toc.section.depth>0 and count($nodes) &gt; 0">
+ <xsl:copy-of select="$subtoc.list"/>
+ </xsl:if>
+ </xsl:element>
+ <xsl:if test="$toc.listitem.type != 'li'
+ and $toc.section.depth>0 and count($nodes) &gt; 0">
+ <xsl:copy-of select="$subtoc.list"/>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="preface|chapter|appendix|article" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="section|sect1" mode="toc"/>
+ <xsl:apply-templates select="section|sect1|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -183,13 +238,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>0 and section|sect1">
@@ -205,7 +260,7 @@
<xsl:template match="sect1" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="sect2" mode="toc"/>
+ <xsl:apply-templates select="sect2|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -223,13 +278,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>1 and sect2">
@@ -245,7 +300,7 @@
<xsl:template match="sect2" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="sect3" mode="toc"/>
+ <xsl:apply-templates select="sect3|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -263,13 +318,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>2 and sect3">
@@ -285,7 +340,7 @@
<xsl:template match="sect3" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="sect4" mode="toc"/>
+ <xsl:apply-templates select="sect4|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -303,13 +358,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>3 and sect4">
@@ -325,7 +380,7 @@
<xsl:template match="sect4" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="sect5" mode="toc"/>
+ <xsl:apply-templates select="sect5|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -343,13 +398,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toc.section.depth>4 and sect5">
@@ -364,13 +419,13 @@
<xsl:template match="sect5" mode="toc">
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
</xsl:element>
</xsl:template>
@@ -378,7 +433,7 @@
<xsl:template match="section" mode="toc">
<xsl:variable name="subtoc">
<xsl:element name="{$toc.list.type}">
- <xsl:apply-templates select="section" mode="toc"/>
+ <xsl:apply-templates select="section|bridgehead" mode="toc"/>
</xsl:element>
</xsl:variable>
@@ -410,13 +465,13 @@
</xsl:variable>
<xsl:element name="{$toc.listitem.type}">
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
<a>
<xsl:attribute name="href">
<xsl:call-template name="href.target"/>
</xsl:attribute>
- <xsl:apply-templates select="." mode="title.content"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</a>
<xsl:if test="$toc.listitem.type = 'li'
and $toodeep='no' and section">
@@ -429,22 +484,29 @@
</xsl:if>
</xsl:template>
-<xsl:template match="bibliography|glossary"
- mode="toc">
+<xsl:template match="bridgehead" mode="toc">
+ <xsl:if test="$bridgehead.in.toc != 0">
+ <xsl:element name="{$toc.listitem.type}">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target"/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a>
+ </xsl:element>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="bibliography|glossary" mode="toc">
<xsl:element name="{$toc.listitem.type}">
- <xsl:choose>
- <xsl:when test="title[1]">
- <xsl:apply-templates select="title[1]" mode="toc"/>
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:call-template name="href.target"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </a>
</xsl:element>
</xsl:template>
@@ -452,19 +514,12 @@
<!-- If the index tag is empty, don't point at it from the TOC -->
<xsl:if test="* or $generate.index">
<xsl:element name="{$toc.listitem.type}">
- <xsl:choose>
- <xsl:when test="title[1]">
- <xsl:apply-templates select="title[1]" mode="toc"/>
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:call-template name="href.target"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </a>
</xsl:element>
</xsl:if>
</xsl:template>
diff --git a/tests/docbook/html/biblio.xsl b/tests/docbook/html/biblio.xsl
index 27420257..22057491 100644
--- a/tests/docbook/html/biblio.xsl
+++ b/tests/docbook/html/biblio.xsl
@@ -15,28 +15,10 @@
<!-- ==================================================================== -->
<xsl:template match="bibliography">
- <div class="{name(.)}">
- <xsl:call-template name="component.separator"/>
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title" mode="component.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <h2 class="title">
- <a>
- <xsl:attribute name="name">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </h2>
- </xsl:otherwise>
- </xsl:choose>
-
- <xsl:if test="./subtitle">
- <xsl:apply-templates select="./subtitle" mode="component.title.mode"/>
- </xsl:if>
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+ <div id="{$id}" class="{name(.)}">
+ <xsl:call-template name="bibliography.titlepage"/>
<xsl:apply-templates/>
<xsl:call-template name="process.footnotes"/>
</div>
@@ -334,7 +316,9 @@
<xsl:template match="copyright" mode="bibliography.mode">
<span class="{name(.)}">
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Copyright'"/>
+ </xsl:call-template>
<xsl:call-template name="gentext.space"/>
<xsl:call-template name="dingbat">
<xsl:with-param name="dingbat">copyright</xsl:with-param>
diff --git a/tests/docbook/html/block.xsl b/tests/docbook/html/block.xsl
index bf53b8db..9b171eec 100644
--- a/tests/docbook/html/block.xsl
+++ b/tests/docbook/html/block.xsl
@@ -66,7 +66,7 @@
<xsl:template match="formalpara/title">
<b><xsl:apply-templates/></b>
- <xsl:text> </xsl:text>
+ <xsl:call-template name="gentext.space"/>
</xsl:template>
<xsl:template match="formalpara/para">
@@ -146,7 +146,9 @@
<div class="{name(.)}">
<xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="title.markup">
+ <xsl:with-param name="allow-anchors" select="'1'"/>
+ </xsl:apply-templates>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates/>
@@ -206,11 +208,37 @@
<xsl:call-template name="block.object"/>
</xsl:template>
-<xsl:template match="msglevel|msgorig|msgaud">
+<xsl:template match="msglevel">
<p>
<b>
- <xsl:call-template name="gentext.element.name"/>
- <xsl:text>: </xsl:text>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgLevel'"/>
+ </xsl:call-template>
+ </b>
+ <xsl:apply-templates/>
+ </p>
+</xsl:template>
+
+<xsl:template match="msgorig">
+ <p>
+ <b>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgOrig'"/>
+ </xsl:call-template>
+ </b>
+ <xsl:apply-templates/>
+ </p>
+</xsl:template>
+
+<xsl:template match="msgaud">
+ <p>
+ <b>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'msgset'"/>
+ <xsl:with-param name="name" select="'MsgAud'"/>
+ </xsl:call-template>
</b>
<xsl:apply-templates/>
</p>
@@ -231,7 +259,11 @@
<table border="0" width="100%" summary="Revision history">
<tr>
<th align="left" valign="top" colspan="3">
- <b><xsl:call-template name="gentext.element.name"/></b>
+ <b>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'RevHistory'"/>
+ </xsl:call-template>
+ </b>
</th>
</tr>
<xsl:apply-templates/>
@@ -247,8 +279,10 @@
<tr>
<td align="left">
<xsl:if test="$revnumber">
- <xsl:call-template name="gentext.element.name"/>
- <xsl:text> </xsl:text>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Revision'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
<xsl:apply-templates select="$revnumber"/>
</xsl:if>
</td>
diff --git a/tests/docbook/html/callout.xsl b/tests/docbook/html/callout.xsl
index 68ca333d..9af57225 100644
--- a/tests/docbook/html/callout.xsl
+++ b/tests/docbook/html/callout.xsl
@@ -1,8 +1,9 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:verb5="http://nwalsh.com/com.nwalsh.saxon.Verbatim"
- xmlns:verb6="http://nwalsh.com/com.nwalsh.saxon6.Verbatim"
- exclude-result-prefixes="verb5 verb6"
+ xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
+ xmlns:xverb="com.nwalsh.xalan.Verbatim"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="sverb xverb lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -15,54 +16,48 @@
******************************************************************** -->
+<lxslt:component prefix="xverb"
+ functions="insertCallouts"/>
+
<xsl:template match="programlistingco|screenco">
<xsl:variable name="verbatim" select="programlisting|screen"/>
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.callouts != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $callouts.extension != '0'">
<xsl:variable name="rtf">
<xsl:apply-templates select="$verbatim">
<xsl:with-param name="suppress-numbers" select="'1'"/>
</xsl:apply-templates>
</xsl:variable>
+
<xsl:variable name="rtf-with-callouts">
<xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:insertCallouts(areaspec,$rtf)"/>
+ <xsl:when test="contains($vendor, 'SAXON ')">
+ <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
</xsl:when>
- <xsl:when test="$callout.graphics != 0">
- <xsl:copy-of select="verb5:insertCallouts(areaspec,$rtf,
- $callout.defaultcolumn,
- $callout.graphics.path,
- $callout.graphics.extension,
- $callout.graphics.number.limit,
- false())"/>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="verb5:insertCallouts(areaspec,$rtf,
- $callout.defaultcolumn)"/>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do callouts with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose>
<xsl:when test="$verbatim/@linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $linenumbering.extension != '0'">
<div class="{name(.)}">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf-with-callouts)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf-with-callouts,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
+ <xsl:with-param name="pi.context"
+ select="programlisting|screen"/>
+ </xsl:call-template>
<xsl:apply-templates select="calloutlist"/>
</div>
</xsl:when>
@@ -110,16 +105,44 @@
<xsl:param name="conum" select='1'/>
<xsl:choose>
- <xsl:when test="$callout.graphics = '0'
- or $conum > $callout.graphics.number.limit">
-
+ <xsl:when test="$callout.graphics != 0
+ and $conum &lt;= $callout.graphics.number.limit">
+ <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"
+ alt="{$conum}" border="0"/>
+ </xsl:when>
+ <xsl:when test="$callout.unicode != 0
+ and $conum &lt;= $callout.unicode.number.limit">
+ <xsl:choose>
+ <xsl:when test="$callout.unicode.start.character = 10102">
+ <xsl:choose>
+ <xsl:when test="$conum = 1">&#10102;</xsl:when>
+ <xsl:when test="$conum = 2">&#10103;</xsl:when>
+ <xsl:when test="$conum = 3">&#10104;</xsl:when>
+ <xsl:when test="$conum = 4">&#10105;</xsl:when>
+ <xsl:when test="$conum = 5">&#10106;</xsl:when>
+ <xsl:when test="$conum = 6">&#10107;</xsl:when>
+ <xsl:when test="$conum = 7">&#10108;</xsl:when>
+ <xsl:when test="$conum = 8">&#10109;</xsl:when>
+ <xsl:when test="$conum = 9">&#10110;</xsl:when>
+ <xsl:when test="$conum = 10">&#10111;</xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
+ <xsl:text>when $callout.unicode.start.character is </xsl:text>
+ <xsl:value-of select="$callout.unicode.start.character"/>
+ </xsl:message>
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="$conum"/>
+ <xsl:text>)</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:text>(</xsl:text>
<xsl:value-of select="$conum"/>
<xsl:text>)</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"
- alt="{$conum}" border="0"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
diff --git a/tests/docbook/html/changebars.xsl b/tests/docbook/html/changebars.xsl
index fee001a1..ad2fcd25 100644
--- a/tests/docbook/html/changebars.xsl
+++ b/tests/docbook/html/changebars.xsl
@@ -36,6 +36,10 @@ span.off { }
or local-name(.) = 'chapter'
or local-name(.) = 'preface'
or local-name(.) = 'itemizedlist'
+ or local-name(.) = 'varlistentry'
+ or local-name(.) = 'glossary'
+ or local-name(.) = 'bibliography'
+ or local-name(.) = 'index'
or local-name(.) = 'appendix'">
<div class='{@revisionflag}'>
<xsl:apply-imports/>
@@ -43,8 +47,12 @@ span.off { }
</xsl:when>
<xsl:when test="local-name(.) = 'phrase'
or local-name(.) = 'ulink'
+ or local-name(.) = 'link'
or local-name(.) = 'filename'
or local-name(.) = 'literal'
+ or local-name(.) = 'member'
+ or local-name(.) = 'glossterm'
+ or local-name(.) = 'quote'
or local-name(.) = 'emphasis'
or local-name(.) = 'command'
or local-name(.) = 'xref'">
@@ -61,7 +69,7 @@ span.off { }
<xsl:message>
<xsl:text>Revisionflag on unexpected element: </xsl:text>
<xsl:value-of select="local-name(.)"/>
- <xsl:text>(Assuming block)</xsl:text>
+ <xsl:text> (Assuming block)</xsl:text>
</xsl:message>
<div class='{@revisionflag}'>
<xsl:apply-imports/>
diff --git a/tests/docbook/html/chunk-common.xsl b/tests/docbook/html/chunk-common.xsl
index 4b3221a1..a658196c 100644
--- a/tests/docbook/html/chunk-common.xsl
+++ b/tests/docbook/html/chunk-common.xsl
@@ -1,20 +1,32 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:saxon="http://icl.com/saxon"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
version="1.0"
- exclude-result-prefixes="doc"
- extension-element-prefixes="saxon xalanredirect lxslt">
-
-<xsl:import href="docbook.xsl"/>
+ exclude-result-prefixes="doc">
<xsl:output method="html"
encoding="ISO-8859-1"
indent="no"/>
<xsl:param name="html.ext" select="'.html'"/>
+<doc:param name="html.ext" xmlns="">
+<refpurpose>Extension for chunked files</refpurpose>
+<refdescription>
+<para>The extension identified by <parameter>html.ext</parameter> will
+be used as the filename extension for chunks created by this stylesheet.
+</para>
+</refdescription>
+</doc:param>
+
<xsl:param name="root.filename" select="'index'"/>
+<doc:param name="root.filename" xmlns="">
+<refpurpose>Filename for the root chunk</refpurpose>
+<refdescription>
+<para>The <parameter>root.filename</parameter> is the base filename for
+the chunk created for the root of each document processed.
+</para>
+</refdescription>
+</doc:param>
+
<xsl:param name="base.dir" select="''"/>
<doc:param name="base.dir" xmlns="">
<refpurpose>Output directory for chunks</refpurpose>
@@ -25,6 +37,29 @@ is system dependent.)</para>
</refdescription>
</doc:param>
+<xsl:param name="chunk.sections" select="'1'"/>
+<doc:param name="chunk.sections" xmlns="">
+<refpurpose>Create chunks for top-level sections in components?</refpurpose>
+<refdescription>
+<para>If non-zero, chunks will be created for top-level
+<sgmltag>sect1</sgmltag> and <sgmltag>section</sgmltag> elements in
+each component.
+</para>
+</refdescription>
+</doc:param>
+
+<xsl:param name="chunk.first.sections" select="'0'"/>
+<doc:param name="chunk.first.sections" xmlns="">
+<refpurpose>Create a chunk for the first top-level section in each component?</refpurpose>
+<refdescription>
+<para>If non-zero, a chunk will be created for the first top-level
+<sgmltag>sect1</sgmltag> or <sgmltag>section</sgmltag> elements in
+each component. Otherwise, that section will be part of the chunk for
+its parent.
+</para>
+</refdescription>
+</doc:param>
+
<!-- ==================================================================== -->
<!-- What's a chunk?
@@ -51,12 +86,38 @@ is system dependent.)</para>
<xsl:param name="node" select="."/>
<!-- returns 1 if $node is a chunk -->
+<!--
+ <xsl:message>
+ <xsl:text>chunk: </xsl:text>
+ <xsl:value-of select="name($node)"/>
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="$node/@id"/>
+ <xsl:text>)</xsl:text>
+ <xsl:text> cs: </xsl:text>
+ <xsl:value-of select="$chunk.sections"/>
+ <xsl:text> cfs: </xsl:text>
+ <xsl:value-of select="$chunk.first.sections"/>
+ <xsl:text> ps: </xsl:text>
+ <xsl:value-of select="count($node/parent::section)"/>
+ <xsl:text> prs: </xsl:text>
+ <xsl:value-of select="count($node/preceding-sibling::section)"/>
+ </xsl:message>
+-->
+
<xsl:choose>
- <xsl:when test="name($node)='sect1'
- and count($node/preceding-sibling::sect1) > 0">1</xsl:when>
- <xsl:when test="name($node)='section'
- and count($node/parent::section) = 0
- and count($node/preceding-sibling::section) > 0">1</xsl:when>
+ <xsl:when test="$chunk.sections != 0
+ and name($node)='sect1'
+ and ($chunk.first.sections != 0
+ or count($node/preceding-sibling::sect1) > 0)">
+ <xsl:text>1</xsl:text>
+ </xsl:when>
+ <xsl:when test="$chunk.sections != 0
+ and name($node)='section'
+ and ($chunk.first.sections != 0
+ or (count($node/parent::section) = 0
+ and count($node/preceding-sibling::section)))>0">
+ <xsl:text>1</xsl:text>
+ </xsl:when>
<xsl:when test="name($node)='preface'">1</xsl:when>
<xsl:when test="name($node)='chapter'">1</xsl:when>
<xsl:when test="name($node)='appendix'">1</xsl:when>
@@ -87,10 +148,31 @@ is system dependent.)</para>
<xsl:param name="recursive" select="false()"/>
<!-- returns the filename of a chunk -->
- <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
- <xsl:variable name="filename">
+ <xsl:variable name="ischunk">
+ <xsl:call-template name="chunk"/>
+ </xsl:variable>
+
+ <xsl:variable name="dbhtml-filename">
<xsl:call-template name="dbhtml-filename"/>
</xsl:variable>
+
+ <xsl:variable name="filename">
+ <xsl:choose>
+ <xsl:when test="$dbhtml-filename != ''">
+ <xsl:value-of select="$dbhtml-filename"/>
+ </xsl:when>
+ <!-- if there's no dbhtml filename, and if we're to use IDs as -->
+ <!-- filenames, *and* this isn't the root node, then use the ID -->
+ <!-- to generate the filename. -->
+ <xsl:when test="@id and $use.id.as.filename != 0
+ and . != /*">
+ <xsl:value-of select="@id"/>
+ <xsl:value-of select="$html.ext"/>
+ </xsl:when>
+ <xsl:otherwise></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:variable name="dir">
<xsl:call-template name="dbhtml-dir"/>
</xsl:variable>
@@ -141,13 +223,13 @@ is system dependent.)</para>
</xsl:when>
<xsl:when test="name(.)='article'">
+ <xsl:if test="/set">
+ <!-- in a set, make sure we inherit the right book info... -->
+ <xsl:apply-templates mode="chunk-filename" select="parent::*">
+ <xsl:with-param name="recursive" select="true()"/>
+ </xsl:apply-templates>
+ </xsl:if>
<xsl:choose>
- <xsl:when test="/set">
- <!-- in a set, make sure we inherit the right book info... -->
- <xsl:apply-templates mode="chunk-filename" select="parent::*">
- <xsl:with-param name="recursive" select="true()"/>
- </xsl:apply-templates>
- </xsl:when>
<xsl:when test="count(parent::*)>0">
<!-- if we aren't the root, name them numerically ... -->
<xsl:text>ar</xsl:text>
@@ -362,9 +444,8 @@ is system dependent.)</para>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="title">
- <xsl:apply-templates select="$home" mode="title.ref">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$home"
+ mode="object.title.markup.textonly"/>
</xsl:attribute>
</link>
</xsl:if>
@@ -377,9 +458,7 @@ is system dependent.)</para>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="title">
- <xsl:apply-templates select="$up" mode="title.ref">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$up" mode="object.title.markup.textonly"/>
</xsl:attribute>
</link>
</xsl:if>
@@ -392,9 +471,7 @@ is system dependent.)</para>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="title">
- <xsl:apply-templates select="$prev" mode="title.ref">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$prev" mode="object.title.markup.textonly"/>
</xsl:attribute>
</link>
</xsl:if>
@@ -407,9 +484,7 @@ is system dependent.)</para>
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="title">
- <xsl:apply-templates select="$next" mode="title.ref">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$next" mode="object.title.markup.textonly"/>
</xsl:attribute>
</link>
</xsl:if>
@@ -426,10 +501,10 @@ is system dependent.)</para>
<xsl:if test="$suppress.navigation = '0'">
<div class="navheader">
- <table width="100%">
+ <table width="100%" summary="Navigation header">
<tr>
<th colspan="3" align="center">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
</th>
</tr>
<tr>
@@ -441,7 +516,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$prev"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.prev"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-prev</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:if>
<xsl:text>&#160;</xsl:text>
@@ -449,7 +526,7 @@ is system dependent.)</para>
<th width="60%" align="center">
<xsl:choose>
<xsl:when test="count($up) > 0 and $up != $home">
- <xsl:apply-templates select="$up" mode="title.ref"/>
+ <xsl:apply-templates select="$up" mode="object.title.markup"/>
</xsl:when>
<xsl:otherwise>&#160;</xsl:otherwise>
</xsl:choose>
@@ -463,7 +540,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$next"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.next"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-next</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:if>
</td>
@@ -485,7 +564,7 @@ is system dependent.)</para>
<xsl:if test="$suppress.navigation = '0'">
<div class="navfooter">
<hr/>
- <table width="100%">
+ <table width="100%" summary="Navigation footer">
<tr>
<td width="40%" align="left">
<xsl:if test="count($prev)>0">
@@ -495,7 +574,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$prev"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.prev"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-prev</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:if>
<xsl:text>&#160;</xsl:text>
@@ -509,7 +590,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$home"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.home"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-home</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:when>
<xsl:otherwise>&#160;</xsl:otherwise>
@@ -524,7 +607,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$next"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.next"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-next</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:if>
</td>
@@ -532,7 +617,7 @@ is system dependent.)</para>
<tr>
<td width="40%" align="left">
- <xsl:apply-templates select="$prev" mode="title.ref"/>
+ <xsl:apply-templates select="$prev" mode="object.title.markup"/>
<xsl:text>&#160;</xsl:text>
</td>
<td width="20%" align="center">
@@ -544,7 +629,9 @@ is system dependent.)</para>
<xsl:with-param name="object" select="$up"/>
</xsl:call-template>
</xsl:attribute>
- <xsl:call-template name="gentext.nav.up"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key">nav-up</xsl:with-param>
+ </xsl:call-template>
</a>
</xsl:when>
<xsl:otherwise>&#160;</xsl:otherwise>
@@ -552,7 +639,7 @@ is system dependent.)</para>
</td>
<td width="40%" align="right">
<xsl:text>&#160;</xsl:text>
- <xsl:apply-templates select="$next" mode="title.ref"/>
+ <xsl:apply-templates select="$next" mode="object.title.markup"/>
</td>
</tr>
</table>
@@ -569,8 +656,60 @@ is system dependent.)</para>
<!-- ==================================================================== -->
<xsl:template name="process-chunk-element">
- <xsl:variable name="root" select="count(parent::*) &gt; 0"/>
+ <xsl:choose>
+ <xsl:when test="$chunk.sections = 0">
+ <xsl:call-template name="chunk-no-sections"/>
+ </xsl:when>
+ <xsl:when test="$chunk.first.sections = 0">
+ <xsl:call-template name="chunk-first-section-with-parent"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="chunk-all-top-level-sections"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="process-chunk">
+ <xsl:param name="prev" select="."/>
+ <xsl:param name="next" select="."/>
+
+ <xsl:variable name="ischunk">
+ <xsl:call-template name="chunk"/>
+ </xsl:variable>
+
+ <xsl:variable name="chunkfn">
+ <xsl:if test="$ischunk='1'">
+ <xsl:apply-templates mode="chunk-filename" select="."/>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:if test="$ischunk='0'">
+ <xsl:message>
+ <xsl:text>Error </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:text> is not a chunk!</xsl:text>
+ </xsl:message>
+ </xsl:if>
+
+ <xsl:variable name="filename">
+ <xsl:call-template name="make-relative-filename">
+ <xsl:with-param name="base.dir" select="$base.dir"/>
+ <xsl:with-param name="base.name" select="$chunkfn"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:call-template name="write.chunk">
+ <xsl:with-param name="filename" select="$filename"/>
+ <xsl:with-param name="content">
+ <xsl:call-template name="chunk-element-content">
+ <xsl:with-param name="prev" select="$prev"/>
+ <xsl:with-param name="next" select="$next"/>
+ </xsl:call-template>
+ </xsl:with-param>
+ </xsl:call-template>
+</xsl:template>
+<xsl:template name="chunk-first-section-with-parent">
<xsl:variable name="prev"
select="(preceding::book[1]
|preceding::preface[1]
@@ -629,46 +768,131 @@ is system dependent.)</para>
|descendant::sect1[2]
|descendant::section[name(parent::*) != 'section'][2])[1]"/>
- <xsl:variable name="ischunk">
- <xsl:call-template name="chunk"/>
- </xsl:variable>
+ <xsl:call-template name="process-chunk">
+ <xsl:with-param name="prev" select="$prev"/>
+ <xsl:with-param name="next" select="$next"/>
+ </xsl:call-template>
+</xsl:template>
- <xsl:variable name="chunkfn">
- <xsl:if test="$ischunk='1'">
- <xsl:apply-templates mode="chunk-filename" select="."/>
- </xsl:if>
- </xsl:variable>
+<xsl:template name="chunk-all-top-level-sections">
+ <xsl:variable name="prev"
+ select="(preceding::book[1]
+ |preceding::preface[1]
+ |preceding::chapter[1]
+ |preceding::appendix[1]
+ |preceding::part[1]
+ |preceding::reference[1]
+ |preceding::refentry[1]
+ |preceding::colophon[1]
+ |preceding::sect1[1]
+ |preceding::section[name(parent::*) != 'section'][1]
+ |preceding::article[1]
+ |preceding::bibliography[1]
+ |preceding::glossary[1]
+ |preceding::index[1]
+ |preceding::setindex[1]
+ |ancestor::set
+ |ancestor::book[1]
+ |ancestor::preface[1]
+ |ancestor::chapter[1]
+ |ancestor::appendix[1]
+ |ancestor::part[1]
+ |ancestor::reference[1]
+ |ancestor::article[1])[last()]"/>
- <xsl:if test="$ischunk='0'">
- <xsl:message>
- <xsl:text>Error </xsl:text>
- <xsl:value-of select="name(.)"/>
- <xsl:text> is not a chunk!</xsl:text>
- </xsl:message>
- </xsl:if>
+ <xsl:variable name="next"
+ select="(following::book[1]
+ |following::preface[1]
+ |following::chapter[1]
+ |following::appendix[1]
+ |following::part[1]
+ |following::reference[1]
+ |following::refentry[1]
+ |following::colophon[1]
+ |following::sect1[1]
+ |following::section[name(parent::*) != 'section'][1]
+ |following::bibliography[1]
+ |following::glossary[1]
+ |following::index[1]
+ |following::article[1]
+ |following::setindex[1]
+ |descendant::book[1]
+ |descendant::preface[1]
+ |descendant::chapter[1]
+ |descendant::appendix[1]
+ |descendant::article[1]
+ |descendant::bibliography[1]
+ |descendant::glossary[1]
+ |descendant::index[1]
+ |descendant::colophon[1]
+ |descendant::setindex[1]
+ |descendant::part[1]
+ |descendant::reference[1]
+ |descendant::refentry[1]
+ |descendant::sect1[1]
+ |descendant::section[name(parent::*) != 'section'][1])[1]"/>
- <xsl:variable name="filename">
- <xsl:call-template name="make-relative-filename">
- <xsl:with-param name="base.dir" select="$base.dir"/>
- <xsl:with-param name="base.name" select="$chunkfn"/>
- </xsl:call-template>
- </xsl:variable>
+ <xsl:call-template name="process-chunk">
+ <xsl:with-param name="prev" select="$prev"/>
+ <xsl:with-param name="next" select="$next"/>
+ </xsl:call-template>
+</xsl:template>
- <xsl:message>
- <xsl:text>Writing </xsl:text>
- <xsl:value-of select="$filename"/>
- <xsl:text> for </xsl:text>
- <xsl:value-of select="name(.)"/>
- </xsl:message>
+<xsl:template name="chunk-no-sections">
+ <xsl:variable name="prev"
+ select="(preceding::book[1]
+ |preceding::preface[1]
+ |preceding::chapter[1]
+ |preceding::appendix[1]
+ |preceding::part[1]
+ |preceding::reference[1]
+ |preceding::refentry[1]
+ |preceding::colophon[1]
+ |preceding::article[1]
+ |preceding::bibliography[1]
+ |preceding::glossary[1]
+ |preceding::index[1]
+ |preceding::setindex[1]
+ |ancestor::set
+ |ancestor::book[1]
+ |ancestor::preface[1]
+ |ancestor::chapter[1]
+ |ancestor::appendix[1]
+ |ancestor::part[1]
+ |ancestor::reference[1]
+ |ancestor::article[1])[last()]"/>
- <xsl:call-template name="write.chunk">
- <xsl:with-param name="filename" select="$filename"/>
- <xsl:with-param name="content">
- <xsl:call-template name="chunk-element-content">
- <xsl:with-param name="prev" select="$prev"/>
- <xsl:with-param name="next" select="$next"/>
- </xsl:call-template>
- </xsl:with-param>
+ <xsl:variable name="next"
+ select="(following::book[1]
+ |following::preface[1]
+ |following::chapter[1]
+ |following::appendix[1]
+ |following::part[1]
+ |following::reference[1]
+ |following::refentry[1]
+ |following::colophon[1]
+ |following::bibliography[1]
+ |following::glossary[1]
+ |following::index[1]
+ |following::article[1]
+ |following::setindex[1]
+ |descendant::book[1]
+ |descendant::preface[1]
+ |descendant::chapter[1]
+ |descendant::appendix[1]
+ |descendant::article[1]
+ |descendant::bibliography[1]
+ |descendant::glossary[1]
+ |descendant::index[1]
+ |descendant::colophon[1]
+ |descendant::setindex[1]
+ |descendant::part[1]
+ |descendant::reference[1]
+ |descendant::refentry[1])[1]"/>
+
+ <xsl:call-template name="process-chunk">
+ <xsl:with-param name="prev" select="$prev"/>
+ <xsl:with-param name="next" select="$next"/>
</xsl:call-template>
</xsl:template>
@@ -685,6 +909,8 @@ is system dependent.)</para>
</xsl:call-template>
<body xsl:use-attribute-sets="body.attrs">
+ <xsl:call-template name="user.header.navigation"/>
+
<xsl:call-template name="header.navigation">
<xsl:with-param name="prev" select="$prev"/>
<xsl:with-param name="next" select="$next"/>
@@ -700,6 +926,8 @@ is system dependent.)</para>
<xsl:with-param name="prev" select="$prev"/>
<xsl:with-param name="next" select="$next"/>
</xsl:call-template>
+
+ <xsl:call-template name="user.footer.navigation"/>
</body>
</html>
</xsl:template>
@@ -723,33 +951,250 @@ is system dependent.)</para>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:apply-templates/>
+ <xsl:apply-templates select="/" mode="process.root"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+<xsl:template match="*" mode="process.root">
+ <xsl:apply-templates select="."/>
+</xsl:template>
+
<xsl:template match="set|book|part|preface|chapter|appendix
|article
|reference|refentry
- |sect1[position()>1]
- |section[position()>1 and name(parent::*) != 'section']
|book/glossary|article/glossary
|book/bibliography|article/bibliography
|colophon">
<xsl:call-template name="process-chunk-element"/>
</xsl:template>
+<xsl:template match="sect1|section[local-name(parent::*) != 'section']">
+<!--
+ <xsl:message>
+ <xsl:text>cs: </xsl:text>
+ <xsl:value-of select="$chunk.sections"/>
+ <xsl:text> cfs: </xsl:text>
+ <xsl:value-of select="$chunk.first.sections"/>
+ <xsl:text> pos: </xsl:text>
+ <xsl:value-of select="position()"/>
+ </xsl:message>
+-->
+
+ <xsl:choose>
+ <xsl:when test="$chunk.sections = 0">
+ <xsl:apply-imports/>
+ </xsl:when>
+ <xsl:when test="$chunk.first.sections = 0">
+ <xsl:choose>
+ <xsl:when test="count(preceding-sibling::section) > 0
+ or count(preceding-sibling::sect1) > 0">
+ <xsl:call-template name="process-chunk-element"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-imports/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="process-chunk-element"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
<xsl:template match="setindex
|book/index
|article/index">
<!-- some implementations use completely empty index tags to indicate -->
<!-- where an automatically generated index should be inserted. so -->
<!-- if the index is completely empty, skip it. -->
- <xsl:if test="count(*)>0">
+ <xsl:if test="count(*)>0 or $generate.index != '0'">
<xsl:call-template name="process-chunk-element"/>
</xsl:if>
</xsl:template>
<!-- ==================================================================== -->
+<xsl:template name="in.other.chunk">
+ <xsl:param name="chunk" select="."/>
+ <xsl:param name="node" select="."/>
+
+ <xsl:variable name="is.chunk">
+ <xsl:call-template name="chunk">
+ <xsl:with-param name="node" select="$node"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+<!--
+ <xsl:message>
+ <xsl:text>in.other.chunk: </xsl:text>
+ <xsl:value-of select="name($chunk)"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="name($node)"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$chunk = $node"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$is.chunk"/>
+ </xsl:message>
+-->
+
+ <xsl:choose>
+ <xsl:when test="$chunk = $node">0</xsl:when>
+ <xsl:when test="$is.chunk = 1">1</xsl:when>
+ <xsl:when test="count($node) = 0">0</xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="in.other.chunk">
+ <xsl:with-param name="chunk" select="$chunk"/>
+ <xsl:with-param name="node" select="$node/parent::*"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="count.footnotes.in.this.chunk">
+ <xsl:param name="node" select="."/>
+ <xsl:param name="footnotes" select="$node//footnote"/>
+ <xsl:param name="count" select="0"/>
+
+<!--
+ <xsl:message>
+ <xsl:text>count.footnotes.in.this.chunk: </xsl:text>
+ <xsl:value-of select="name($node)"/>
+ </xsl:message>
+-->
+
+ <xsl:variable name="in.other.chunk">
+ <xsl:call-template name="in.other.chunk">
+ <xsl:with-param name="chunk" select="$node"/>
+ <xsl:with-param name="node" select="$footnotes[1]"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="count($footnotes) = 0">
+ <xsl:value-of select="$count"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="$in.other.chunk != 0">
+ <xsl:call-template name="count.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ <xsl:with-param name="count" select="$count"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$footnotes[1]/ancestor::table
+ |$footnotes[1]/ancestor::informaltable">
+ <xsl:call-template name="count.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ <xsl:with-param name="count" select="$count"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="count.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ <xsl:with-param name="count" select="$count + 1"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="process.footnotes.in.this.chunk">
+ <xsl:param name="node" select="."/>
+ <xsl:param name="footnotes" select="$node//footnote"/>
+
+<!--
+ <xsl:message>process.footnotes.in.this.chunk</xsl:message>
+-->
+
+ <xsl:variable name="in.other.chunk">
+ <xsl:call-template name="in.other.chunk">
+ <xsl:with-param name="chunk" select="$node"/>
+ <xsl:with-param name="node" select="$footnotes[1]"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="count($footnotes) = 0">
+ <!-- nop -->
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="$in.other.chunk != 0">
+ <xsl:call-template name="process.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="$footnotes[1]/ancestor::table
+ |$footnotes[1]/ancestor::informaltable">
+ <xsl:call-template name="process.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="$footnotes[1]"
+ mode="process.footnote.mode"/>
+ <xsl:call-template name="process.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="footnotes"
+ select="$footnotes[position() &gt; 1]"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="process.footnotes">
+ <xsl:variable name="footnotes" select=".//footnote"/>
+ <xsl:variable name="fcount">
+ <xsl:call-template name="count.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="."/>
+ <xsl:with-param name="footnotes" select="$footnotes"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+<!--
+ <xsl:message>
+ <xsl:value-of select="name(.)"/>
+ <xsl:text> fcount: </xsl:text>
+ <xsl:value-of select="$fcount"/>
+ </xsl:message>
+-->
+
+ <!-- Only bother to do this if there's at least one non-table footnote -->
+ <xsl:if test="$fcount &gt; 0">
+ <div class="footnotes">
+ <br/>
+ <hr width="100" align="left"/>
+ <xsl:call-template name="process.footnotes.in.this.chunk">
+ <xsl:with-param name="node" select="."/>
+ <xsl:with-param name="footnotes" select="$footnotes"/>
+ </xsl:call-template>
+ </div>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template name="process.chunk.footnotes">
+ <xsl:variable name="is.chunk">
+ <xsl:call-template name="chunk"/>
+ </xsl:variable>
+ <xsl:if test="$is.chunk = 1">
+ <xsl:call-template name="process.footnotes"/>
+ </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
</xsl:stylesheet>
diff --git a/tests/docbook/html/chunk.xsl b/tests/docbook/html/chunk.xsl
index 250c2967..2b7e7bed 100644
--- a/tests/docbook/html/chunk.xsl
+++ b/tests/docbook/html/chunk.xsl
@@ -3,65 +3,14 @@
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
- version="1.0"
+ version="1.1"
exclude-result-prefixes="doc"
extension-element-prefixes="saxon xalanredirect lxslt">
-<!-- This stylesheet does not work with XT. Use xtchunk.xsl instead. -->
+<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunk.xsl -->
+<xsl:import href="autoidx.xsl"/>
<xsl:include href="chunk-common.xsl"/>
-
-<!-- ==================================================================== -->
-<!-- This is a workaround for a XalanJ1 bug in element-available. -->
-
-<lxslt:component prefix="xalanredirect" elements="write">
- <lxslt:script lang="javaclass"
- src="org.apache.xalan.xslt.extensions.Redirect"/>
-</lxslt:component>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
- <xsl:param name="base.dir" select="'./'"/>
- <xsl:param name="base.name" select="''"/>
-
- <xsl:choose>
- <xsl:when test="element-available('xalanredirect:write')">
- <!-- Xalan doesn't make the chunks relative -->
- <xsl:value-of select="concat($base.dir,$base.name)"/>
- </xsl:when>
- <xsl:when test="element-available('saxon:output')">
- <!-- Saxon doesn't make the chunks relative -->
- <xsl:value-of select="concat($base.dir,$base.name)"/>
- </xsl:when>
- <!-- XT makes chunks relative, but it doesn't support -->
- <!-- element-available() so use xtchunk.xsl instead. -->
- <xsl:otherwise>
- <!-- it doesn't matter since we won't be making chunks... -->
- <xsl:value-of select="$base.name"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
- <xsl:param name="filename" select="''"/>
- <xsl:param name="method" select="'html'"/>
- <xsl:param name="encoding" select="'ISO-8859-1'"/>
- <xsl:param name="content" select="''"/>
-
- <xalanredirect:write file="{$filename}">
- <xsl:copy-of select="$content"/>
- <xsl:fallback>
- <saxon:output file="{$filename}"
- method="{$method}"
- encoding="{$encoding}">
- <xsl:copy-of select="$content"/>
- <xsl:fallback>
- <xsl:copy-of select="$content"/>
- </xsl:fallback>
- </saxon:output>
- </xsl:fallback>
- </xalanredirect:write>
-</xsl:template>
+<xsl:include href="chunker.xsl"/>
</xsl:stylesheet>
diff --git a/tests/docbook/html/chunker.xsl b/tests/docbook/html/chunker.xsl
new file mode 100644
index 00000000..02577cf1
--- /dev/null
+++ b/tests/docbook/html/chunker.xsl
@@ -0,0 +1,163 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:saxon="http://icl.com/saxon"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ version="1.1"
+ exclude-result-prefixes="doc"
+ extension-element-prefixes="saxon xalanredirect lxslt">
+
+<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunker.xsl -->
+
+<!-- ==================================================================== -->
+
+<xsl:template name="make-relative-filename">
+ <xsl:param name="base.dir" select="'./'"/>
+ <xsl:param name="base.name" select="''"/>
+
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <!-- Saxon doesn't make the chunks relative -->
+ <xsl:value-of select="concat($base.dir,$base.name)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache')">
+ <!-- Xalan doesn't make the chunks relative -->
+ <xsl:value-of select="concat($base.dir,$base.name)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Chunking isn't supported with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="write.chunk">
+ <xsl:param name="filename" select="''"/>
+ <xsl:param name="method" select="'html'"/>
+ <xsl:param name="encoding" select="$default.encoding"/>
+ <xsl:param name="indent" select="'no'"/>
+ <xsl:param name="content" select="''"/>
+
+ <xsl:message>
+ <xsl:text>Writing </xsl:text>
+ <xsl:value-of select="$filename"/>
+ <xsl:if test="name(.) != ''">
+ <xsl:text> for </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@id">
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="@id"/>
+ <xsl:text>)</xsl:text>
+ </xsl:if>
+ </xsl:if>
+ </xsl:message>
+
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON 6.2')">
+ <!-- Saxon 6.2.x uses xsl:document -->
+ <xsl:document href="{$filename}"
+ method="{$method}"
+ encoding="{$encoding}"
+ indent="{$indent}"
+ saxon:character-representation="{$saxon.character.representation}">
+ <xsl:copy-of select="$content"/>
+ </xsl:document>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <!-- Saxon uses saxon:output -->
+ <saxon:output file="{$filename}"
+ href="{$filename}"
+ method="{$method}"
+ encoding="{$encoding}"
+ indent="{$indent}"
+ saxon:character-representation="{$saxon.character.representation}">
+ <xsl:copy-of select="$content"/>
+ </saxon:output>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache')">
+ <!-- Xalan uses xalanredirect -->
+ <xalanredirect:write file="{$filename}">
+ <xsl:copy-of select="$content"/>
+ </xalanredirect:write>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- it doesn't matter since we won't be making chunks... -->
+ <xsl:message terminate="yes">
+ <xsl:text>Can't make chunks with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ <xsl:text>'s processor.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="write.chunk.with.doctype">
+ <xsl:param name="filename" select="''"/>
+ <xsl:param name="method" select="'html'"/>
+ <xsl:param name="encoding" select="$default.encoding"/>
+ <xsl:param name="indent" select="'no'"/>
+ <xsl:param name="doctype-public" select="''"/>
+ <xsl:param name="doctype-system" select="''"/>
+ <xsl:param name="content" select="''"/>
+
+ <xsl:message>
+ <xsl:text>Writing </xsl:text>
+ <xsl:value-of select="$filename"/>
+ <xsl:if test="name(.) != ''">
+ <xsl:text> for </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:if>
+ </xsl:message>
+
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON 6.2')">
+ <!-- Saxon 6.2.x uses xsl:document -->
+ <xsl:document href="{$filename}"
+ method="{$method}"
+ encoding="{$encoding}"
+ indent="{$indent}"
+ doctype-public="{$doctype-public}"
+ doctype-system="{$doctype-system}"
+ saxon:character-representation="{$saxon.character.representation}">
+ <xsl:copy-of select="$content"/>
+ </xsl:document>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <!-- Saxon uses saxon:output -->
+ <saxon:output file="{$filename}"
+ href="{$filename}"
+ method="{$method}"
+ encoding="{$encoding}"
+ indent="{$indent}"
+ doctype-public="{$doctype-public}"
+ doctype-system="{$doctype-system}"
+ saxon:character-representation="{$saxon.character.representation}">
+ <xsl:copy-of select="$content"/>
+ </saxon:output>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache')">
+ <!-- Xalan uses xalanredirect -->
+ <xalanredirect:write file="{$filename}">
+ <xsl:copy-of select="$content"/>
+ </xalanredirect:write>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- it doesn't matter since we won't be making chunks... -->
+ <xsl:message terminate="yes">
+ <xsl:text>Can't make chunks with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ <xsl:text>'s processor.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/html/component.xsl b/tests/docbook/html/component.xsl
index 63e46e57..22256c40 100644
--- a/tests/docbook/html/component.xsl
+++ b/tests/docbook/html/component.xsl
@@ -24,22 +24,23 @@
<h2 class="title">
<a name="{$id}"/>
- <xsl:apply-templates select="$node" mode="title.ref">
- <xsl:with-param name="allow-anchors" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$node" mode="object.title.markup"/>
</h2>
</xsl:template>
<xsl:template name="component.subtitle">
<xsl:param name="node" select="."/>
- <xsl:variable name="subtitle">
- <xsl:apply-templates select="$node" mode="subtitle.content"/>
- </xsl:variable>
-
- <xsl:if test="$subtitle != ''">
+ <xsl:variable name="subtitle"
+ select="($node/docinfo/subtitle
+ |$node/prefaceinfo/subtitle
+ |$node/chapterinfo/subtitle
+ |$node/appendixinfo/subtitle
+ |$node/subtitle)[1]"/>
+
+ <xsl:if test="$subtitle">
<h3 class="subtitle">
<i>
- <xsl:copy-of select="$subtitle"/>
+ <xsl:apply-templates select="$node" mode="object.subtitle.markup"/>
</i>
</h3>
</xsl:if>
@@ -59,6 +60,18 @@
</div>
</xsl:template>
+<xsl:template match="title" mode="dedication.titlepage.recto.mode">
+ <xsl:call-template name="component.title">
+ <xsl:with-param name="node" select="ancestor::dedication[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="dedication.titlepage.recto.mode">
+ <xsl:call-template name="component.subtitle">
+ <xsl:with-param name="node" select="ancestor::dedication[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="dedication"></xsl:template> <!-- see mode="dedication" -->
<xsl:template match="dedication/title"></xsl:template>
<xsl:template match="dedication/subtitle"></xsl:template>
@@ -104,6 +117,12 @@
</xsl:call-template>
</xsl:template>
+<xsl:template match="subtitle" mode="preface.titlepage.recto.mode">
+ <xsl:call-template name="component.subtitle">
+ <xsl:with-param name="node" select="ancestor::preface[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="preface/docinfo|prefaceinfo"></xsl:template>
<xsl:template match="preface/title"></xsl:template>
<xsl:template match="preface/titleabbrev"></xsl:template>
@@ -116,7 +135,7 @@
<xsl:call-template name="object.id"/>
</xsl:variable>
- <div id="{$id}" class="{name(.)}">
+ <div class="{name(.)}">
<xsl:call-template name="component.separator"/>
<xsl:call-template name="chapter.titlepage"/>
<xsl:if test="$generate.chapter.toc != '0'">
@@ -133,6 +152,12 @@
</xsl:call-template>
</xsl:template>
+<xsl:template match="subtitle" mode="chapter.titlepage.recto.mode">
+ <xsl:call-template name="component.subtitle">
+ <xsl:with-param name="node" select="ancestor::chapter[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="chapter/docinfo|chapterinfo"></xsl:template>
<xsl:template match="chapter/title"></xsl:template>
<xsl:template match="chapter/titleabbrev"></xsl:template>
@@ -145,7 +170,7 @@
<xsl:call-template name="object.id"/>
</xsl:variable>
- <div id="{$id}" class="{name(.)}">
+ <div class="{name(.)}">
<xsl:call-template name="component.separator"/>
<xsl:call-template name="appendix.titlepage"/>
<xsl:if test="$generate.appendix.toc != '0'">
@@ -156,12 +181,33 @@
</div>
</xsl:template>
+<xsl:template match="article/appendix">
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+ <div class="{name(.)}">
+ <xsl:call-template name="section.heading">
+ <xsl:with-param name="level" select="2"/>
+ <xsl:with-param name="title">
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </xsl:with-param>
+ </xsl:call-template>
+
+ <xsl:apply-templates/>
+ </div>
+</xsl:template>
+
<xsl:template match="title" mode="appendix.titlepage.recto.mode">
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor::appendix[1]"/>
</xsl:call-template>
</xsl:template>
+<xsl:template match="subtitle" mode="appendix.titlepage.recto.mode">
+ <xsl:call-template name="component.subtitle">
+ <xsl:with-param name="node" select="ancestor::appendix[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="appendix/docinfo|appendixinfo"></xsl:template>
<xsl:template match="appendix/title"></xsl:template>
<xsl:template match="appendix/titleabbrev"></xsl:template>
@@ -239,7 +285,7 @@
<xsl:template match="article">
<xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
- <div id="{$id}" class="{name(.)}">
+ <div class="{name(.)}">
<xsl:call-template name="article.titlepage"/>
<xsl:if test="$generate.article.toc != '0'">
<xsl:call-template name="component.toc"/>
@@ -249,28 +295,23 @@
</div>
</xsl:template>
+<xsl:template match="title" mode="article.titlepage.recto.mode">
+ <xsl:call-template name="component.title">
+ <xsl:with-param name="node" select="ancestor::article[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="article.titlepage.recto.mode">
+ <xsl:call-template name="component.subtitle">
+ <xsl:with-param name="node" select="ancestor::article[1]"/>
+ </xsl:call-template>
+</xsl:template>
+
<xsl:template match="article/artheader|article/articleinfo"></xsl:template>
<xsl:template match="article/title"></xsl:template>
+<xsl:template match="article/titleabbrev"></xsl:template>
<xsl:template match="article/subtitle"></xsl:template>
-<xsl:template match="article/appendix">
- <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
- <div id="{$id}" class="{name(.)}">
- <xsl:call-template name="section.heading">
- <xsl:with-param name="level" select="2"/>
- <xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
- </xsl:with-param>
- </xsl:call-template>
-
- <xsl:apply-templates/>
- <xsl:if test="not(ancestor::article)">
- <xsl:call-template name="process.footnotes"/>
- </xsl:if>
- </div>
-</xsl:template>
-
<!-- ==================================================================== -->
</xsl:stylesheet>
diff --git a/tests/docbook/html/division.xsl b/tests/docbook/html/division.xsl
index c7c29251..63760ee8 100644
--- a/tests/docbook/html/division.xsl
+++ b/tests/docbook/html/division.xsl
@@ -30,6 +30,7 @@
<xsl:template match="set/setinfo"></xsl:template>
<xsl:template match="set/title"></xsl:template>
+<xsl:template match="set/titleabbrev"></xsl:template>
<xsl:template match="set/subtitle"></xsl:template>
<!-- ==================================================================== -->
@@ -51,6 +52,7 @@
<xsl:template match="book/bookinfo"></xsl:template>
<xsl:template match="book/title"></xsl:template>
+<xsl:template match="book/titleabbrev"></xsl:template>
<xsl:template match="book/subtitle"></xsl:template>
<!-- ==================================================================== -->
@@ -78,7 +80,9 @@
</xsl:template>
<xsl:template match="part/docinfo"></xsl:template>
+<xsl:template match="part/partinfo"></xsl:template>
<xsl:template match="part/title"></xsl:template>
+<xsl:template match="part/titleabbrev"></xsl:template>
<xsl:template match="part/subtitle"></xsl:template>
<xsl:template match="partintro">
@@ -94,8 +98,8 @@
</xsl:template>
<xsl:template match="partintro/title"></xsl:template>
-<xsl:template match="partintro/subtitle"></xsl:template>
<xsl:template match="partintro/titleabbrev"></xsl:template>
+<xsl:template match="partintro/subtitle"></xsl:template>
<xsl:template match="partintro/title" mode="partintro.title.mode">
<xsl:variable name="id">
diff --git a/tests/docbook/html/docbook.xsl b/tests/docbook/html/docbook.xsl
index 73e64954..df66280c 100644
--- a/tests/docbook/html/docbook.xsl
+++ b/tests/docbook/html/docbook.xsl
@@ -21,9 +21,14 @@
<!-- ==================================================================== -->
<xsl:include href="../VERSION"/>
+<xsl:include href="param.xsl"/>
<xsl:include href="../lib/lib.xsl"/>
<xsl:include href="../common/l10n.xsl"/>
<xsl:include href="../common/common.xsl"/>
+<xsl:include href="../common/labels.xsl"/>
+<xsl:include href="../common/titles.xsl"/>
+<xsl:include href="../common/subtitles.xsl"/>
+<xsl:include href="../common/gentext.xsl"/>
<xsl:include href="autotoc.xsl"/>
<xsl:include href="lists.xsl"/>
<xsl:include href="callout.xsl"/>
@@ -52,7 +57,6 @@
<xsl:include href="synop.xsl"/>
<xsl:include href="titlepage.xsl"/>
<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="param.xsl"/>
<xsl:include href="pi.xsl"/>
<!-- ==================================================================== -->
@@ -81,33 +85,9 @@
<xsl:template name="head.content">
<xsl:param name="node" select="."/>
- <xsl:variable name="info" select="($node/docinfo
- |$node/chapterinfo
- |$node/appendixinfo
- |$node/prefaceinfo
- |$node/bookinfo
- |$node/setinfo
- |$node/articleinfo
- |$node/artheader
- |$node/sect1info
- |$node/sect2info
- |$node/sect3info
- |$node/sect4info
- |$node/sect5info
- |$node/refsect1info
- |$node/refsect2info
- |$node/refsect3info
- |$node/bibliographyinfo
- |$node/glossaryinfo
- |$node/indexinfo
- |$node/refentryinfo
- |$node/partinfo
- |$node/referenceinfo)[1]"/>
<title>
- <xsl:apply-templates select="$node" mode="title.ref">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
</title>
<xsl:if test="$html.stylesheet">
@@ -127,13 +107,51 @@
<meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/>
- <xsl:apply-templates select="$info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="." mode="head.keywords.content"/>
</xsl:template>
+<!-- ============================================================ -->
+
+<xsl:template match="*" mode="head.keywords.content">
+ <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
+ <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
+
+ <xsl:if test="$inherit.keywords != 0
+ and parent::*">
+ <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
+ </xsl:if>
+</xsl:template>
+
+<!-- ============================================================ -->
+
<xsl:template name="user.head.content">
<xsl:param name="node" select="."/>
</xsl:template>
+<xsl:template name="user.header.navigation">
+ <xsl:param name="node" select="."/>
+</xsl:template>
+
<xsl:template name="user.header.content">
<xsl:param name="node" select="."/>
</xsl:template>
@@ -142,6 +160,10 @@
<xsl:param name="node" select="."/>
</xsl:template>
+<xsl:template name="user.footer.navigation">
+ <xsl:param name="node" select="."/>
+</xsl:template>
+
<xsl:template match="/">
<xsl:choose>
<xsl:when test="$rootid != ''">
@@ -171,7 +193,9 @@
<xsl:call-template name="head.content">
<xsl:with-param name="node" select="$doc"/>
</xsl:call-template>
- <xsl:call-template name="user.head.content"/>
+ <xsl:call-template name="user.head.content">
+ <xsl:with-param name="node" select="$doc"/>
+ </xsl:call-template>
</head>
<body xsl:use-attribute-sets="body.attrs">
<xsl:call-template name="user.header.content">
diff --git a/tests/docbook/html/ebnf.xsl b/tests/docbook/html/ebnf.xsl
index 2bcb200f..598d577b 100644
--- a/tests/docbook/html/ebnf.xsl
+++ b/tests/docbook/html/ebnf.xsl
@@ -330,7 +330,7 @@ borders, otherwise they don't.</para>
<a href="{$href}">
<xsl:variable name="targets" select="id(@linkend)"/>
<xsl:variable name="target" select="$targets[1]"/>
- <xsl:apply-templates select="$target" mode="title.content"/>
+ <xsl:apply-templates select="$target" mode="title.markup"/>
</a>
<xsl:text> ]</xsl:text>
</xsl:template>
diff --git a/tests/docbook/html/footnote.xsl b/tests/docbook/html/footnote.xsl
index a5c7ec7d..2ace0e0e 100644
--- a/tests/docbook/html/footnote.xsl
+++ b/tests/docbook/html/footnote.xsl
@@ -119,6 +119,10 @@
</xsl:if>
</xsl:template>
+<xsl:template name="process.chunk.footnotes">
+ <!-- nop -->
+</xsl:template>
+
<xsl:template match="footnote" mode="process.footnote.mode">
<div class="{name(.)}">
<xsl:apply-templates/>
diff --git a/tests/docbook/html/formal.xsl b/tests/docbook/html/formal.xsl
index d0f8fec9..ea331c5d 100644
--- a/tests/docbook/html/formal.xsl
+++ b/tests/docbook/html/formal.xsl
@@ -16,7 +16,7 @@
<div class="{name(.)}">
<xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates/>
@@ -24,14 +24,13 @@
</xsl:template>
<xsl:template name="formal.object.heading">
- <xsl:param name="title"></xsl:param>
<p>
<a>
<xsl:attribute name="name">
<xsl:call-template name="object.id"/>
</xsl:attribute>
</a>
- <b><xsl:copy-of select="$title"/></b>
+ <b><xsl:apply-templates select="." mode="object.title.markup"/></b>
</p>
</xsl:template>
diff --git a/tests/docbook/html/glossary.xsl b/tests/docbook/html/glossary.xsl
index 1885f845..138cb916 100644
--- a/tests/docbook/html/glossary.xsl
+++ b/tests/docbook/html/glossary.xsl
@@ -15,31 +15,30 @@
<!-- ==================================================================== -->
<xsl:template match="glossary">
- <div class="{name(.)}">
- <xsl:call-template name="component.separator"/>
+ <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+ <div id="{$id}" class="{name(.)}">
+ <xsl:call-template name="glossary.titlepage"/>
+
<xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title" mode="component.title.mode"/>
+ <xsl:when test="glossdiv">
+ <xsl:apply-templates select="(glossdiv[1]/preceding-sibling::*)"/>
</xsl:when>
<xsl:otherwise>
- <h2 class="title">
- <a>
- <xsl:attribute name="name">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- </a>
- <xsl:call-template name="gentext.element.name"/>
- </h2>
+ <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:if test="./subtitle">
- <xsl:apply-templates select="./subtitle" mode="component.title.mode"/>
- </xsl:if>
-
- <dl>
- <xsl:apply-templates/>
- </dl>
+ <xsl:choose>
+ <xsl:when test="glossdiv">
+ <xsl:apply-templates select="glossdiv"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <dl>
+ <xsl:apply-templates select="glossentry"/>
+ </dl>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:call-template name="process.footnotes"/>
</div>
@@ -82,7 +81,11 @@
<xsl:template match="glossdiv">
<div class="{name(.)}">
- <xsl:apply-templates/>
+ <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
+
+ <dl>
+ <xsl:apply-templates select="glossentry"/>
+ </dl>
</div>
</xsl:template>
@@ -141,8 +144,10 @@ GlossEntry ::=
<xsl:variable name="target" select="$targets[1]"/>
<dd>
<p>
- <xsl:call-template name="gentext.element.name"/>
- <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'glossary'"/>
+ <xsl:with-param name="name" select="'see'"/>
+ </xsl:call-template>
<xsl:choose>
<xsl:when test="@otherterm">
<a href="#{@otherterm}">
@@ -159,28 +164,44 @@ GlossEntry ::=
</xsl:template>
<xsl:template match="glossentry/glossdef">
- <dd><xsl:apply-templates/></dd>
+ <dd>
+ <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
+ <xsl:if test="glossseealso">
+ <p>
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'glossary'"/>
+ <xsl:with-param name="name" select="'seealso'"/>
+ </xsl:call-template>
+ <xsl:apply-templates select="glossseealso"/>
+ </p>
+ </xsl:if>
+ </dd>
</xsl:template>
<xsl:template match="glossseealso">
<xsl:variable name="otherterm" select="@otherterm"/>
<xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
<xsl:variable name="target" select="$targets[1]"/>
- <p>
- <xsl:call-template name="gentext.element.name"/>
- <xsl:call-template name="gentext.space"/>
- <xsl:choose>
- <xsl:when test="@otherterm">
- <a href="#{@otherterm}">
- <xsl:apply-templates select="$target" mode="xref"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>.</xsl:text>
- </p>
+
+ <xsl:choose>
+ <xsl:when test="@otherterm">
+ <a href="#{@otherterm}">
+ <xsl:apply-templates select="$target" mode="xref"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates/>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="position() = last()">
+ <xsl:text>.</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>, </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
diff --git a/tests/docbook/html/graphics.xsl b/tests/docbook/html/graphics.xsl
index e30af9d7..44428674 100644
--- a/tests/docbook/html/graphics.xsl
+++ b/tests/docbook/html/graphics.xsl
@@ -1,10 +1,11 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:text5="http://nwalsh.com/com.nwalsh.saxon.TextFactory"
- xmlns:text6="http://nwalsh.com/com.nwalsh.saxon6.TextFactory"
- exclude-result-prefixes="xlink text5 text6"
- extension-element-prefixes="text5 text6"
+ xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
+ xmlns:xtext="com.nwalsh.xalan.Text"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="xlink stext xtext lxslt"
+ extension-element-prefixes="stext xtext"
version='1.0'>
<!-- ********************************************************************
@@ -20,6 +21,37 @@
******************************************************************** -->
+<lxslt:component prefix="xtext"
+ elements="insertfile"/>
+
+<!-- ==================================================================== -->
+<!-- Graphic format tests for the HTML backend -->
+
+<xsl:template name="is.graphic.format">
+ <xsl:param name="format"></xsl:param>
+ <xsl:if test="$format = 'PNG'
+ or $format = 'JPG'
+ or $format = 'JPEG'
+ or $format = 'linespecific'
+ or $format = 'GIF'
+ or $format = 'GIF87a'
+ or $format = 'GIF89a'
+ or $format = 'BMP'">1</xsl:if>
+</xsl:template>
+
+<xsl:template name="is.graphic.extension">
+ <xsl:param name="ext"></xsl:param>
+ <xsl:if test="$ext = 'png'
+ or $ext = 'jpeg'
+ or $ext = 'jpg'
+ or $ext = 'avi'
+ or $ext = 'mpg'
+ or $ext = 'mpeg'
+ or $ext = 'qt'
+ or $ext = 'gif'
+ or $ext = 'bmp'">1</xsl:if>
+</xsl:template>
+
<!-- ==================================================================== -->
<xsl:template match="screenshot">
@@ -127,49 +159,40 @@
<xsl:template match="inlinegraphic">
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+ <xsl:variable name="filename">
+ <xsl:choose>
+ <xsl:when test="@entityref">
+ <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@fileref"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<xsl:choose>
<xsl:when test="@format='linespecific'">
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.textinsert != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $textinsert.extension != '0'">
<xsl:choose>
- <xsl:when test="@entityref">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <stext:insertfile href="{$filename}"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xtext:insertfile href="{$filename}"/>
</xsl:when>
<xsl:otherwise>
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{@fileref}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{@fileref}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to insert files with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad">
- <xsl:choose>
- <xsl:when test="@entityref">
- <xsl:attribute name="href">
- <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href">
- <xsl:value-of select="@fileref"/>
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </a>
+ <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
+ href="{$filename}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -198,6 +221,7 @@
<xsl:template match="imageobjectco">
<xsl:apply-templates select="imageobject"/>
+ <xsl:apply-templates select="calloutlist"/>
</xsl:template>
<xsl:template match="imageobject">
@@ -215,46 +239,26 @@
<xsl:choose>
<xsl:when test="@format='linespecific'">
<xsl:choose>
- <xsl:when test="$saxon.extensions != '0'
- and $saxon.textinsert != '0'">
+ <xsl:when test="$use.extensions != '0'
+ and $textinsert.extension != '0'">
<xsl:choose>
- <xsl:when test="@entityref">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{unparsed-entity-uri(@entityref)}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON')">
+ <stext:insertfile href="{$filename}"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xtext:insertfile href="{$filename}"/>
</xsl:when>
<xsl:otherwise>
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <text6:insertfile href="{@fileref}"/>
- </xsl:when>
- <xsl:otherwise>
- <text5:insertfile href="{@fileref}"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to insert files with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad">
- <xsl:choose>
- <xsl:when test="@entityref">
- <xsl:attribute name="href">
- <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href">
- <xsl:value-of select="@fileref"/>
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </a>
+ <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
+ href="{$filename}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
diff --git a/tests/docbook/html/index.xsl b/tests/docbook/html/index.xsl
index 183d5063..dbfe89d2 100644
--- a/tests/docbook/html/index.xsl
+++ b/tests/docbook/html/index.xsl
@@ -1,36 +1,4 @@
<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary 'concat(primary/@sortas, primary[not(@sortas)])'>
-<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
-<!ENTITY tertiary 'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
-
-<!ENTITY section '(ancestor-or-self::set
- |ancestor-or-self::book
- |ancestor-or-self::part
- |ancestor-or-self::reference
- |ancestor-or-self::partintro
- |ancestor-or-self::chapter
- |ancestor-or-self::appendix
- |ancestor-or-self::preface
- |ancestor-or-self::section
- |ancestor-or-self::sect1
- |ancestor-or-self::sect2
- |ancestor-or-self::sect3
- |ancestor-or-self::sect4
- |ancestor-or-self::sect5
- |ancestor-or-self::refsect1
- |ancestor-or-self::refsect2
- |ancestor-or-self::refsect3
- |ancestor-or-self::simplesect
- |ancestor-or-self::bibliography
- |ancestor-or-self::glossary
- |ancestor-or-self::index)[last()]'>
-
-<!ENTITY section.id 'generate-id(&section;)'>
-<!ENTITY sep '" "'>
-]>
-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'>
@@ -49,30 +17,17 @@
<xsl:template match="index|setindex">
<!-- some implementations use completely empty index tags to indicate -->
<!-- where an automatically generated index should be inserted. so -->
- <!-- if the index is completely empty, skip it. -->
- <xsl:if test="count(*)>0 or $generate.index">
- <div class="{name(.)}">
- <xsl:call-template name="component.separator"/>
- <xsl:choose>
- <xsl:when test="./title">
- <xsl:apply-templates select="./title" mode="component.title.mode"/>
- </xsl:when>
- <xsl:otherwise>
- <h2 class="title">
- <a>
- <xsl:attribute name="name">
- <xsl:call-template name="object.id"/>
- </xsl:attribute>
- <xsl:call-template name="gentext.element.name"/>
- </a>
- </h2>
- </xsl:otherwise>
- </xsl:choose>
+ <!-- if the index is completely empty, skip it. Unless generate.index -->
+ <!-- is non-zero, in which case, this is where the automatically -->
+ <!-- generated index should go. -->
- <xsl:if test="./subtitle">
- <xsl:apply-templates select="./subtitle" mode="component.title.mode"/>
- </xsl:if>
+ <xsl:if test="count(*)>0 or $generate.index != '0'">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+ <div id="{$id}" class="{name(.)}">
+ <xsl:call-template name="index.titlepage"/>
<xsl:apply-templates/>
<xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
@@ -223,256 +178,8 @@
</dt>
</xsl:template>
-<!-- ==================================================================== -->
-<!-- Jeni Tennison gets all the credit for what follows.
- I think I understand it :-) Anyway, I've hacked it a bit, so the
- bugs are mine. -->
-
-<xsl:key name="letter"
- match="indexterm"
- use="substring(&primary;, 1, 1)"/>
-
-<xsl:key name="primary"
- match="indexterm"
- use="&primary;"/>
-
-<xsl:key name="secondary"
- match="indexterm"
- use="concat(&primary;, &sep;, &secondary;)"/>
-
-<xsl:key name="tertiary"
- match="indexterm"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-
-<xsl:key name="primary-section"
- match="indexterm[not(secondary) and not(see)]"
- use="concat(&primary;, &sep;, &section.id;)"/>
-
-<xsl:key name="secondary-section"
- match="indexterm[not(tertiary) and not(see)]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &section.id;)"/>
-
-<xsl:key name="tertiary-section"
- match="indexterm[not(see)]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, &section.id;)"/>
-
-<xsl:key name="see-also"
- match="indexterm[seealso]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso)"/>
-
-<xsl:key name="see"
- match="indexterm[see]"
- use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/>
-
-<xsl:key name="sections" match="*[@id]" use="@id"/>
-
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-
<xsl:template name="generate-index">
- <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
- substring(&primary;, 1, 1))[1]) = 1]"/>
- <xsl:variable name="alphabetical"
- select="$terms[contains(concat($lowercase, $uppercase),
- substring(&primary;, 1, 1))]"/>
- <xsl:variable name="others" select="$terms[not(contains(concat($lowercase,
- $uppercase),
- substring(&primary;, 1, 1)))]"/>
- <div class="index">
- <xsl:if test="$others">
- <div class="indexdiv">
- <h3>
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'index symbols'"/>
- </xsl:call-template>
- </h3>
- <dl>
- <xsl:apply-templates select="$others[count(.|key('primary',
- &primary;)[1]) = 1]"
- mode="index-primary">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </dl>
- </div>
- </xsl:if>
- <xsl:apply-templates select="$alphabetical[count(.|key('letter',
- substring(&primary;, 1, 1))[1]) = 1]"
- mode="index-div">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </div>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div">
- <xsl:variable name="key" select="substring(&primary;, 1, 1)"/>
- <div class="indexdiv">
- <h3>
- <xsl:value-of select="translate($key, $lowercase, $uppercase)"/>
- </h3>
- <dl>
- <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[1]) = 1]"
- mode="index-primary">
- <xsl:sort select="&primary;"/>
- </xsl:apply-templates>
- </dl>
- </div>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
- <xsl:variable name="key" select="&primary;"/>
- <xsl:variable name="refs" select="key('primary', $key)"/>
- <dt>
- <xsl:value-of select="primary"/>
- <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </dt>
- <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
- <dd>
- <dl>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[1]) = 1]"
- mode="index-secondary">
- <xsl:sort select="&secondary;"/>
- </xsl:apply-templates>
- </dl>
- </dd>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
- <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
- <xsl:variable name="refs" select="key('secondary', $key)"/>
- <dt>
- <xsl:value-of select="secondary"/>
- <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </dt>
- <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
- <dd>
- <dl>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[1]) = 1]"
- mode="index-tertiary">
- <xsl:sort select="&tertiary;"/>
- </xsl:apply-templates>
- </dl>
- </dd>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
- <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
- <xsl:variable name="refs" select="key('tertiary', $key)"/>
- <dt>
- <xsl:value-of select="tertiary"/>
- <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[1])]">
- <xsl:apply-templates select="." mode="reference"/>
- </xsl:for-each>
- </dt>
- <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
- <xsl:if test="$see">
- <dd>
- <dl>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[1])]"
- mode="index-see">
- <xsl:sort select="see"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[1])]"
- mode="index-seealso">
- <xsl:sort select="seealso"/>
- </xsl:apply-templates>
- </dl>
- </dd>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
- <xsl:text>, </xsl:text>
- <xsl:choose>
- <xsl:when test="@zone and string(@zone)">
- <xsl:call-template name="reference">
- <xsl:with-param name="zones" select="normalize-space(@zone)"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:call-template name="href.target">
- <xsl:with-param name="object" select="&section;"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:apply-templates select="&section;" mode="title.content">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
- </a>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
- <xsl:param name="zones"/>
- <xsl:choose>
- <xsl:when test="contains($zones, ' ')">
- <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
- <xsl:variable name="target" select="key('sections', $zone)"/>
-
- <a>
- <xsl:attribute name="href">
- <xsl:call-template name="href.target">
- <xsl:with-param name="object" select="$target[1]"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
- </a>
- <xsl:text>, </xsl:text>
- <xsl:call-template name="reference">
- <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="zone" select="$zones"/>
- <xsl:variable name="target" select="key('sections', $zone)"/>
-
- <a>
- <xsl:attribute name="href">
- <xsl:call-template name="href.target">
- <xsl:with-param name="object" select="$target[1]"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
- <dt><xsl:value-of select="see"/></dt>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
- <dt><xsl:value-of select="seealso"/></dt>
-</xsl:template>
-
-<xsl:template match="*" mode="index-title-content">
- <xsl:apply-templates select="&section;" mode="title.content">
- <xsl:with-param name="text-only" select="'1'"/>
- </xsl:apply-templates>
+ <!-- nop: use autoidx.xsl to get automatic indexing -->
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/html/inline.xsl b/tests/docbook/html/inline.xsl
index 7901a593..82e147e7 100644
--- a/tests/docbook/html/inline.xsl
+++ b/tests/docbook/html/inline.xsl
@@ -360,7 +360,31 @@
</xsl:template>
<xsl:template match="citerefentry">
- <xsl:call-template name="inline.charseq"/>
+ <xsl:choose>
+ <xsl:when test="$citerefentry.link != '0'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="generate.citerefentry.link"/>
+ </xsl:attribute>
+ <xsl:call-template name="inline.charseq"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="inline.charseq"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="generate.citerefentry.link">
+ <!-- nop -->
+</xsl:template>
+
+<xsl:template name="x.generate.citerefentry.link">
+ <xsl:text>http://example.com/cgi-bin/man.cgi?</xsl:text>
+ <xsl:value-of select="refentrytitle"/>
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="manvolnum"/>
+ <xsl:text>)</xsl:text>
</xsl:template>
<xsl:template match="citetitle">
@@ -432,11 +456,22 @@
<xsl:template match="trademark">
<xsl:call-template name="inline.charseq"/>
- <xsl:if test="@class">
- <xsl:call-template name="dingbat">
- <xsl:with-param name="dingbat" select="@class"/>
- </xsl:call-template>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when test="@class = 'copyright'
+ or @class = 'registered'">
+ <xsl:call-template name="dingbat">
+ <xsl:with-param name="dingbat" select="@class"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="@class = 'service'">
+ <sup>SM</sup>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="dingbat">
+ <xsl:with-param name="dingbat" select="'trademark'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="firstterm">
@@ -444,7 +479,35 @@
</xsl:template>
<xsl:template match="glossterm">
- <xsl:call-template name="inline.charseq"/>
+ <xsl:choose>
+ <xsl:when test="@linkend">
+ <xsl:variable name="targets" select="id(@linkend)"/>
+ <xsl:variable name="target" select="$targets[1]"/>
+
+ <xsl:call-template name="check.id.unique">
+ <xsl:with-param name="linkend" select="@linkend"/>
+ </xsl:call-template>
+
+ <a>
+ <xsl:if test="@id">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@id"/>
+ </xsl:attribute>
+ </xsl:if>
+
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="object" select="$target"/>
+ </xsl:call-template>
+ </xsl:attribute>
+
+ <xsl:call-template name="inline.italicseq"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="inline.italicseq"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="sgmltag">
@@ -463,7 +526,7 @@
<xsl:choose>
<xsl:when test="$class='attribute'">
- <xsl:call-template name="inline.charseq"/>
+ <xsl:call-template name="inline.monoseq"/>
</xsl:when>
<xsl:when test="$class='attvalue'">
<xsl:call-template name="inline.monoseq"/>
@@ -673,7 +736,16 @@
<!-- ==================================================================== -->
-<xsl:template match="pob|street|city|state|postcode|country|phone|fax|otheraddr">
+<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
+ <xsl:call-template name="inline.charseq"/>
+</xsl:template>
+
+<xsl:template match="phone|fax">
+ <xsl:call-template name="inline.charseq"/>
+</xsl:template>
+
+<!-- in Addresses, for example -->
+<xsl:template match="honorific|firstname|surname|lineage|othername">
<xsl:call-template name="inline.charseq"/>
</xsl:template>
diff --git a/tests/docbook/html/lists.xsl b/tests/docbook/html/lists.xsl
index 2bae5e6f..7a9d1c35 100644
--- a/tests/docbook/html/lists.xsl
+++ b/tests/docbook/html/lists.xsl
@@ -20,7 +20,12 @@
<xsl:apply-templates select="title"/>
</xsl:if>
<ul>
- <xsl:apply-templates select="listitem"/>
+ <xsl:if test="@spacing='compact'">
+ <xsl:attribute name="compact">
+ <xsl:value-of select="@spacing"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates select="listitem"/>
</ul>
</div>
</xsl:template>
@@ -399,11 +404,16 @@
<!-- ==================================================================== -->
<xsl:template match="procedure">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
<div class="{name(.)}">
+ <a name="{$id}"/>
<xsl:if test="title">
<xsl:apply-templates select="title" mode="procedure.title.mode"/>
</xsl:if>
- <ol><xsl:apply-templates/></ol>
+ <xsl:apply-templates select="*[local-name()!='step']"/>
+ <ol><xsl:apply-templates select="step"/></ol>
</div>
</xsl:template>
@@ -419,11 +429,32 @@
</xsl:template>
<xsl:template match="substeps">
- <ol><xsl:apply-templates/></ol>
+ <xsl:variable name="depth" select="count(ancestor::substeps)"/>
+ <xsl:variable name="type" select="$depth mod 5"/>
+ <xsl:variable name="numeration">
+ <xsl:choose>
+ <xsl:when test="$type = 0">a</xsl:when>
+ <xsl:when test="$type = 1">i</xsl:when>
+ <xsl:when test="$type = 2">A</xsl:when>
+ <xsl:when test="$type = 3">I</xsl:when>
+ <xsl:when test="$type = 4">1</xsl:when>
+ </xsl:choose>
+ </xsl:variable>
+
+ <ol type="{$numeration}">
+ <xsl:apply-templates/>
+ </ol>
</xsl:template>
<xsl:template match="step">
- <li><xsl:apply-templates/></li>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <li>
+ <a name="{$id}"/>
+ <xsl:apply-templates/>
+ </li>
</xsl:template>
<xsl:template match="step/title">
@@ -475,7 +506,11 @@
<!-- ==================================================================== -->
<xsl:template match="calloutlist">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
<div class="{name(.)}">
+ <a name="{$id}"/>
<xsl:if test="./title">
<p>
<b>
@@ -504,10 +539,14 @@
</xsl:template>
<xsl:template match="callout">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
<xsl:choose>
<xsl:when test="$callout.list.table != 0">
<tr>
<td width="5%" valign="top" align="left">
+ <a name="{$id}"/>
<xsl:call-template name="callout.arearefs">
<xsl:with-param name="arearefs" select="@arearefs"/>
</xsl:call-template>
@@ -519,6 +558,7 @@
</xsl:when>
<xsl:otherwise>
<dt>
+ <a name="{$id}"/>
<xsl:call-template name="callout.arearefs">
<xsl:with-param name="arearefs" select="@arearefs"/>
</xsl:call-template>
@@ -556,10 +596,13 @@
<xsl:variable name="targets" select="id($arearef)"/>
<xsl:variable name="target" select="$targets[1]"/>
+ <xsl:call-template name="check.id.unique">
+ <xsl:with-param name="linkend" select="$arearef"/>
+ </xsl:call-template>
+
<xsl:choose>
<xsl:when test="count($target)=0">
- <xsl:value-of select="$arearef"/>
- <xsl:text>: ???</xsl:text>
+ <xsl:text>???</xsl:text>
</xsl:when>
<xsl:when test="local-name($target)='co'">
<a>
diff --git a/tests/docbook/html/param.xsl b/tests/docbook/html/param.xsl
index de1e1315..b36aec40 100644
--- a/tests/docbook/html/param.xsl
+++ b/tests/docbook/html/param.xsl
@@ -289,6 +289,7 @@ component that contains them.
<!-- ==================================================================== -->
<xsl:param name="chapter.autolabel" select="1" doc:type='boolean'/>
+<xsl:param name="appendix.autolabel" select="1" doc:type='boolean'/>
<doc:param name="chapter.autolabel" xmlns="">
<refpurpose>Are chapters and appendixes enumerated?</refpurpose>
@@ -510,7 +511,7 @@ SEE xref.xsl IF YOU NEED TO TURN IT OFF.</para>
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="spacing.paras" doc:type='boolean' select="'1'"/>
+<xsl:param name="spacing.paras" doc:type='boolean' select="'0'"/>
<doc:param name="spacing.paras" xmlns="">
<refpurpose>Insert additional &lt;p&gt; elements for spacing?</refpurpose>
@@ -680,23 +681,23 @@ be used.
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.extensions" select="'0'" doc:type='boolean'/>
+<xsl:param name="use.extensions" select="'0'" doc:type='boolean'/>
-<doc:param name="saxon.extensions" xmlns="">
-<refpurpose>Enable Saxon extensions</refpurpose>
+<doc:param name="use.extensions" xmlns="">
+<refpurpose>Enable extensions</refpurpose>
<refdescription>
-<para>If non-zero, saxon extensions may be used. Each extension is
+<para>If non-zero, extensions may be used. Each extension is
further controlled by its own parameter. But if
-<parameter>saxon.extensions</parameter> is zero, no extensions will
+<parameter>use.extensions</parameter> is zero, no extensions will
be used.
</para>
</refdescription>
</doc:param>
<!-- ==================================================================== -->
-<xsl:param name="saxon.textinsert" select="'1'" doc:type='boolean'/>
+<xsl:param name="textinsert.extension" select="'1'" doc:type='boolean'/>
-<doc:param name="saxon.textinsert" xmlns="">
+<doc:param name="textinsert.extension" xmlns="">
<refpurpose>Enable the textinsert extension element</refpurpose>
<refdescription>
<para>The textinsert extension element inserts the contents of a
@@ -720,6 +721,20 @@ have, surprise, line numbers.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="linenumbering.extension" select="'1'" doc:type='boolean'/>
+
+<doc:param name="linenumbering.extension" xmlns="">
+<refpurpose>Enable the line numbering extension</refpurpose>
+<refdescription>
+<para>If true, verbatim environments (elements that have the
+format='linespecific' notation attribute: address, literallayout,
+programlisting, screen, synopsis) that specify line numbering will
+have, surprise, line numbers.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="linenumbering.everyNth" select="'5'" doc:type='integer'/>
<doc:param name="linenumbering.everyNth" xmlns="">
@@ -768,6 +783,19 @@ callout elements.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="callouts.extension" select="'1'" doc:type='boolean'/>
+
+<doc:param name="callouts.extension" xmlns="">
+<refpurpose>Enable the callout extension</refpurpose>
+<refdescription>
+<para>The callouts extension processes <sgmltag>areaset</sgmltag>
+elements in <sgmltag>ProgramListingCO</sgmltag> and other text-based
+callout elements.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="callout.defaultcolumn" select="'60'" doc:type='integer'/>
<doc:param name="callout.defaultcolumn" xmlns="">
@@ -833,9 +861,22 @@ in the CALS table.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="tablecolumns.extension" select="'1'" doc:type='boolean'/>
+
+<doc:param name="tablecolumns.extension" xmlns="">
+<refpurpose>Enable the table columns extension function</refpurpose>
+<refdescription>
+<para>The table columns extension function adjusts the widths of table
+columns in the HTML result to more accurately reflect the specifications
+in the CALS table.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="generate.set.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.set.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -846,7 +887,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.book.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.book.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -857,7 +898,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.part.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.part.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -868,7 +909,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.reference.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.reference.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -879,7 +920,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.preface.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.preface.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -890,7 +931,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.chapter.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.chapter.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -901,7 +942,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.appendix.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.appendix.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -912,7 +953,7 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.article.toc" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.article.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -923,7 +964,29 @@ in the CALS table.
<!-- ==================================================================== -->
<xsl:param name="generate.section.toc" select='0' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.section.toc" xmlns="">
+<refpurpose>FIXME:</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="process.source.toc" select='0' doc:type='boolean'/>
+
+<doc:param name="process.source.toc" xmlns="">
+<refpurpose>FIXME:</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="process.empty.source.toc" select='0' doc:type='boolean'/>
+
+<doc:param name="process.empty.source.toc" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -932,9 +995,33 @@ in the CALS table.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="bridgehead.in.toc" select='0' doc:type='boolean'/>
+
+<doc:param name="bridgehead.in.toc" xmlns="">
+<refpurpose>Should bridgehead elements appear in the TOC?</refpurpose>
+<refdescription>
+<para>If non-zero, bridgeheads appear in the TOC. Note that this option
+is not fully supported and may be removed in a future version of the
+stylesheets.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
<xsl:param name="generate.index" select='1' doc:type='boolean'/>
-<doc:param name="" xmlns="">
+<doc:param name="generate.index" xmlns="">
+<refpurpose>FIXME:</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="callout.unicode" select="0" doc:type='boolean'/>
+
+<doc:param name="callout.unicode" xmlns="">
<refpurpose>FIXME:</refpurpose>
<refdescription>
<para>FIXME:
@@ -943,5 +1030,123 @@ in the CALS table.
</doc:param>
<!-- ==================================================================== -->
+<xsl:param name="callout.unicode.start.character" select="10102"
+ doc:type='integer'/>
+
+<doc:param name="callout.unicode.start.character" xmlns="">
+<refpurpose>Number of the largest callout graphic</refpurpose>
+<refdescription>
+<para>If <parameter>callout.graphics</parameter>
+is non-zero, graphics are used to represent
+callout numbers. The value of
+<parameter>callout.graphics.number.limit</parameter>
+is
+the largest number for which a graphic exists. If the callout number
+exceeds this limit, the default presentation "(nnn)" will always
+be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="callout.unicode.number.limit" select="'10'"
+ doc:type='integer'/>
+
+<doc:param name="callout.unicode.number.limit" xmlns="">
+<refpurpose>Number of the largest callout graphic</refpurpose>
+<refdescription>
+<para>If <parameter>callout.graphics</parameter>
+is non-zero, graphics are used to represent
+callout numbers. The value of
+<parameter>callout.graphics.number.limit</parameter>
+is
+the largest number for which a graphic exists. If the callout number
+exceeds this limit, the default presentation "(nnn)" will always
+be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="use.id.as.filename" select="'0'" doc:type='boolean'/>
+
+<doc:param name="use.id.as.filename" xmlns="">
+<refpurpose>Use ID value of chunk elements as the filename?</refpurpose>
+<refdescription>
+<para>If <parameter>use.id.as.filename</parameter>
+is non-zero, the filename of chunk elements that have IDs will be
+derived from the ID value.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="inherit.keywords" select="'1'" doc:type='boolean'/>
+
+<doc:param name="inherit.keywords" xmlns="">
+<refpurpose>Inherit keywords from ancestor elements?</refpurpose>
+<refdescription>
+<para>If <parameter>inherit.keywords</parameter>
+is non-zero, the keyword <sgmltag>META</sgmltag> for each HTML
+<sgmltag>HEAD</sgmltag> element will include all of the keywords from
+ancestral elements. Otherwise, only the keywords from the current section
+will be used.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="label.from.part" select="'0'" doc:type='boolean'/>
+
+<doc:param name="label.from.part" xmlns="">
+<refpurpose>Renumber chapters in each part?</refpurpose>
+<refdescription>
+<para>If <parameter>label.from.part</parameter> is non-zero, components
+(<sgmltag>chapter</sgmltag>s, <sgmltag>appendixe</sgmltag>s, etc.)
+will be numbered from 1 in each <sgmltag>part</sgmltag>. Otherwise,
+they will be numbered monotonically throughout each
+<sgmltag>book</sgmltag>.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="citerefentry.link" select="'0'" doc:type='boolean'/>
+
+<doc:param name="citerefentry.link" xmlns="">
+<refpurpose>Generate URL links when cross-referencing RefEntrys?</refpurpose>
+<refdescription>
+<para>If true, a web link will be generated, presumably
+to an online man->HTML gateway. The text of the link is
+generated by the generate.citerefentry.link template.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="default.encoding" select="'ISO-8859-1'" doc:type='string'/>
+
+<doc:param name="default.encoding" xmlns="">
+<refpurpose>Encoding used in generated HTML pages</refpurpose>
+<refdescription>
+<para>This encoding is used in files generated by chunking stylesheet. Currently
+only Saxon is able to change output encoding.
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="saxon.character.representation" select="'entity;decimal'" doc:type='string'/>
+
+<doc:param name="saxon.character.representation" xmlns="">
+<refpurpose>Saxon character representation used in generated HTML pages</refpurpose>
+<refdescription>
+<para>This character representation is used in files generated by chunking stylesheet. If
+you want to suppress entity references for characters with direct representation
+in default.encoding, set this parameter to value <literal>native</literal>.
+</para>
+</refdescription>
+</doc:param>
+
</xsl:stylesheet>
diff --git a/tests/docbook/html/qandaset.xsl b/tests/docbook/html/qandaset.xsl
index bdbfea1a..84c318a1 100644
--- a/tests/docbook/html/qandaset.xsl
+++ b/tests/docbook/html/qandaset.xsl
@@ -68,11 +68,10 @@
<xsl:attribute name="class">
<xsl:value-of select="name(.)"/>
</xsl:attribute>
- <a name="{$id}">
- <xsl:apply-templates select="parent::qandadiv" mode="label.content"/>
- <xsl:text> </xsl:text>
- <xsl:apply-templates/>
- </a>
+ <a name="{$id}"/>
+ <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
+ <xsl:text> </xsl:text>
+ <xsl:apply-templates/>
</xsl:element>
</xsl:template>
@@ -83,23 +82,32 @@
</xsl:template>
<xsl:template match="question">
- <xsl:variable name="firstch" select="(*[name(.)!='label'])[1]"/>
- <xsl:variable name="restch" select="(*[name(.)!='label'])[position()!=1]"/>
+ <xsl:variable name="firstch" select="(*[name(.)!='label'
+ and name(.)!='indexterm'])[1]"/>
+ <xsl:variable name="restch" select="(*[name(.)!='label'
+ and name(.)!='indexterm'])[position()!=1]
+ |indexterm"/>
<xsl:variable name="id">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="parent::*"/>
- </xsl:call-template>
+ <xsl:call-template name="object.id"/>
</xsl:variable>
<div class="{name(.)}">
<p>
- <a name="{$id}">
- <b>
- <xsl:apply-templates select="." mode="label.content"/>
- <xsl:text> </xsl:text>
- </b>
- <xsl:apply-templates select="$firstch" mode="no.wrapper.mode"/>
- </a>
+ <xsl:if test="../@id">
+ <a>
+ <xsl:attribute name="name">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="parent::*"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ </a>
+ </xsl:if>
+ <a name="{$id}"/>
+ <b>
+ <xsl:apply-templates select="." mode="label.markup"/>
+ <xsl:text> </xsl:text>
+ </b>
+ <xsl:apply-templates select="$firstch" mode="no.wrapper.mode"/>
</p>
<xsl:apply-templates select="$restch"/>
</div>
@@ -108,11 +116,15 @@
<xsl:template match="answer">
<xsl:variable name="firstch" select="(*[name(.)!='label'])[1]"/>
<xsl:variable name="restch" select="(*[name(.)!='label'])[position()!=1]"/>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
<div class="{name(.)}">
<p>
+ <a name="{$id}"/>
<b>
- <xsl:apply-templates select="." mode="label.content"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
<xsl:text> </xsl:text>
</b>
<xsl:apply-templates select="$firstch" mode="no.wrapper.mode"/>
@@ -149,7 +161,7 @@
</xsl:call-template>
</xsl:variable>
- <xsl:apply-templates select="parent::qandadiv" mode="label.content"/>
+ <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
<xsl:text> </xsl:text>
<a>
<xsl:attribute name="href">
@@ -167,20 +179,13 @@
<xsl:template match="question" mode="qandatoc.mode">
<xsl:variable name="firstch" select="(*[name(.)!='label'])[1]"/>
- <xsl:variable name="id">
- <xsl:call-template name="object.id">
- <xsl:with-param name="object" select="parent::*"/>
- </xsl:call-template>
- </xsl:variable>
<dt>
- <xsl:apply-templates select="." mode="label.content"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
<xsl:text> </xsl:text>
<a>
<xsl:attribute name="href">
- <xsl:call-template name="href.target">
- <xsl:with-param name="object" select="parent::*"/>
- </xsl:call-template>
+ <xsl:call-template name="href.target"/>
</xsl:attribute>
<xsl:value-of select="$firstch"/>
</a>
diff --git a/tests/docbook/html/refentry.xsl b/tests/docbook/html/refentry.xsl
index 0d8dc366..81487467 100644
--- a/tests/docbook/html/refentry.xsl
+++ b/tests/docbook/html/refentry.xsl
@@ -110,7 +110,11 @@
<xsl:template match="refname[1]">
<xsl:if test="$refentry.generate.name != 0">
- <h2><xsl:call-template name="gentext.element.name"/></h2>
+ <h2>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'RefName'"/>
+ </xsl:call-template>
+ </h2>
</xsl:if>
<xsl:apply-templates/>
<xsl:if test="following-sibling::refname">
diff --git a/tests/docbook/html/sections.xsl b/tests/docbook/html/sections.xsl
index ea7eb226..8ec282da 100644
--- a/tests/docbook/html/sections.xsl
+++ b/tests/docbook/html/sections.xsl
@@ -27,10 +27,12 @@
<xsl:call-template name="section.toc"/>
</xsl:if>
<xsl:apply-templates/>
+ <xsl:call-template name="process.chunk.footnotes"/>
</div>
</xsl:template>
-<xsl:template match="title" mode="section.titlepage.recto.mode">
+<xsl:template name="section.title">
+ <!-- the context node should be the title of a section when called -->
<xsl:variable name="section" select="(ancestor::section
|ancestor::simplesect
|ancestor::sect1
@@ -38,25 +40,61 @@
|ancestor::sect3
|ancestor::sect4
|ancestor::sect5)[last()]"/>
+
+ <xsl:variable name="level">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$section"/>
+ </xsl:call-template>
+ </xsl:variable>
+
<xsl:call-template name="section.heading">
- <xsl:with-param name="section" select="$section"/>
- <xsl:with-param name="level">
- <xsl:call-template name="section.level">
- <xsl:with-param name="node" select="$section"/>
- </xsl:call-template>
- </xsl:with-param>
+ <xsl:with-param name="section" select=".."/>
+ <xsl:with-param name="level" select="$level"/>
<xsl:with-param name="title">
- <xsl:apply-templates select="$section" mode="title.ref">
- <xsl:with-param name="label-wrapper" select="'span'"/>
- <xsl:with-param name="label-wrapper-class" select="'label'"/>
- <xsl:with-param name="title-wrapper" select="'span'"/>
- <xsl:with-param name="title-wrapper-class" select="'title'"/>
- <xsl:with-param name="allow-anchors" select="'1'"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="$section" mode="object.title.markup"/>
</xsl:with-param>
</xsl:call-template>
</xsl:template>
+<xsl:template match="title" mode="section.titlepage.recto.mode">
+ <xsl:call-template name="section.title"/>
+</xsl:template>
+
+<xsl:template match="x-title" mode="section.titlepage.recto.mode">
+ <xsl:variable name="section" select="(ancestor::section
+ |ancestor::simplesect
+ |ancestor::sect1
+ |ancestor::sect2
+ |ancestor::sect3
+ |ancestor::sect4
+ |ancestor::sect5)[last()]"/>
+
+ <xsl:variable name="level">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$section"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:message>Level: <xsl:value-of select="$level"/>: <xsl:value-of select="."/></xsl:message>
+
+ <xsl:element name="h{$level}">
+ <xsl:attribute name="class">title</xsl:attribute>
+ <xsl:if test="$css.decoration != '0'">
+ <xsl:if test="$level&lt;3">
+ <xsl:attribute name="style">clear: both</xsl:attribute>
+ </xsl:if>
+ </xsl:if>
+ <a>
+ <xsl:attribute name="name">
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$section"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ </a>
+ <xsl:apply-templates select="$section" mode="object.title.markup"/>
+ </xsl:element>
+</xsl:template>
+
<xsl:template match="sect1">
<xsl:variable name="id">
<xsl:call-template name="object.id"/>
@@ -70,11 +108,12 @@
<xsl:call-template name="section.toc"/>
</xsl:if>
<xsl:apply-templates/>
+ <xsl:call-template name="process.chunk.footnotes"/>
</div>
</xsl:template>
<xsl:template match="title" mode="sect1.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="sect2">
@@ -94,7 +133,7 @@
</xsl:template>
<xsl:template match="title" mode="sect2.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="sect3">
@@ -115,7 +154,7 @@
</xsl:template>
<xsl:template match="title" mode="sect3.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="sect4">
@@ -135,7 +174,7 @@
</xsl:template>
<xsl:template match="title" mode="sect4.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="sect5">
@@ -155,7 +194,7 @@
</xsl:template>
<xsl:template match="title" mode="sect5.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="simplesect">
@@ -171,7 +210,7 @@
</xsl:template>
<xsl:template match="title" mode="simplesect.titlepage.recto.mode">
- <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+ <xsl:call-template name="section.title"/>
</xsl:template>
<xsl:template match="section/title"></xsl:template>
@@ -211,7 +250,7 @@
<xsl:attribute name="class">title</xsl:attribute>
<xsl:if test="$css.decoration != '0'">
<xsl:if test="$level&lt;3">
- <xsl:attribute name="style">clear: all</xsl:attribute>
+ <xsl:attribute name="style">clear: both</xsl:attribute>
</xsl:if>
</xsl:if>
<a>
@@ -228,8 +267,79 @@
<!-- ==================================================================== -->
<xsl:template match="bridgehead">
- <!-- need to calculate depth! -->
- <h3><xsl:apply-templates/></h3>
+ <xsl:variable name="container"
+ select="(ancestor::appendix
+ |ancestor::article
+ |ancestor::bibliography
+ |ancestor::chapter
+ |ancestor::glossary
+ |ancestor::glossdiv
+ |ancestor::index
+ |ancestor::partintro
+ |ancestor::preface
+ |ancestor::refsect1
+ |ancestor::refsect2
+ |ancestor::refsect3
+ |ancestor::sect1
+ |ancestor::sect2
+ |ancestor::sect3
+ |ancestor::sect4
+ |ancestor::sect5
+ |ancestor::section
+ |ancestor::setindex
+ |ancestor::simplesect)[last()]"/>
+
+ <xsl:variable name="clevel">
+ <xsl:choose>
+ <xsl:when test="local-name($container) = 'appendix'
+ or local-name($container) = 'chapter'
+ or local-name($container) = 'article'
+ or local-name($container) = 'bibliography'
+ or local-name($container) = 'glossary'
+ or local-name($container) = 'index'
+ or local-name($container) = 'partintro'
+ or local-name($container) = 'preface'
+ or local-name($container) = 'setindex'">2</xsl:when>
+ <xsl:when test="local-name($container) = 'glossdiv'">
+ <xsl:value-of select="count(ancestor::glossdiv)+2"/>
+ </xsl:when>
+ <xsl:when test="local-name($container) = 'sect1'
+ or local-name($container) = 'sect2'
+ or local-name($container) = 'sect3'
+ or local-name($container) = 'sect4'
+ or local-name($container) = 'sect5'
+ or local-name($container) = 'refsect1'
+ or local-name($container) = 'refsect2'
+ or local-name($container) = 'refsect3'
+ or local-name($container) = 'section'
+ or local-name($container) = 'simplesect'">
+ <xsl:variable name="slevel">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$container"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:value-of select="$slevel + 1"/>
+ </xsl:when>
+ <xsl:otherwise>2</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="level">
+ <xsl:choose>
+ <xsl:when test="@renderas = 'sect1'">2</xsl:when>
+ <xsl:when test="@renderas = 'sect2'">3</xsl:when>
+ <xsl:when test="@renderas = 'sect3'">4</xsl:when>
+ <xsl:when test="@renderas = 'sect4'">5</xsl:when>
+ <xsl:when test="@renderas = 'sect5'">6</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$clevel"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:element name="h{$level}">
+ <xsl:apply-templates/>
+ </xsl:element>
</xsl:template>
</xsl:stylesheet>
diff --git a/tests/docbook/html/synop.xsl b/tests/docbook/html/synop.xsl
index 9c0f30d7..7edd983c 100644
--- a/tests/docbook/html/synop.xsl
+++ b/tests/docbook/html/synop.xsl
@@ -117,7 +117,7 @@
<xsl:apply-templates select="$target" mode="synopfragment.number"/>
</xsl:variable>
<i>
- <a href="{@linkend}">
+ <a href="#{@linkend}">
<xsl:text>(</xsl:text>
<xsl:value-of select="$snum"/>
<xsl:text>)</xsl:text>
diff --git a/tests/docbook/html/table.xsl b/tests/docbook/html/table.xsl
index 72452956..627cc19d 100644
--- a/tests/docbook/html/table.xsl
+++ b/tests/docbook/html/table.xsl
@@ -1,8 +1,10 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
- xmlns:tbl="http://nwalsh.com/com.nwalsh.saxon6.Table"
- exclude-result-prefixes="doc tbl"
+ xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
+ xmlns:xtbl="com.nwalsh.xalan.Table"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="doc stbl xtbl lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -15,6 +17,9 @@
******************************************************************** -->
+<lxslt:component prefix="xtbl"
+ functions="adjustColumnWidths"/>
+
<xsl:template match="tgroup">
<table>
<xsl:choose>
@@ -48,11 +53,14 @@
<xsl:attribute name="width">100%</xsl:attribute>
</xsl:if>
+<!-- this is wrong, align on tgroup gives the default alignment for table
+ cells, not the alignment for the table itself...
<xsl:if test="@align">
<xsl:attribute name="align">
<xsl:value-of select="@align"/>
</xsl:attribute>
</xsl:if>
+-->
<xsl:choose>
<xsl:when test="../@frame='none'">
@@ -102,10 +110,26 @@
<xsl:when test="contains($table.width, '%')">
<xsl:value-of select="$table.width"/>
</xsl:when>
- <xsl:when test="contains($vendor, 'SAXON 6')
- and $saxon.extensions != 0
- and $saxon.tablecolumns != 0">
- <xsl:value-of select="tbl:convertLength($table.width)"/>
+ <xsl:when test="$use.extensions != 0
+ and $tablecolumns.extension != 0">
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON 6')">
+ <xsl:value-of select="stbl:convertLength($table.width)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'SAXON 5')">
+ <!-- the saxon5 extension doesn't support this (yet) -->
+ <xsl:value-of select="$table.width"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:value-of select="xtbl:convertLength($table.width)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do convert lengths with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$table.width"/>
@@ -115,17 +139,35 @@
</xsl:if>
<xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')
- and $saxon.extensions != 0
- and $saxon.tablecolumns != 0">
- <xsl:copy-of select="tbl:adjustColumnWidths($colgroup)"/>
+ <xsl:when test="$use.extensions != 0
+ and $tablecolumns.extension != 0">
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON 6')">
+ <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'SAXON 5')">
+ <!-- the saxon5 extension doesn't support this (yet) -->
+ <xsl:copy-of select="$colgroup"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xtbl:adjustColumnWidths($colgroup)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do adjust column widths with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="$colgroup"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:apply-templates/>
+ <xsl:apply-templates select="thead"/>
+ <xsl:apply-templates select="tbody"/>
+ <xsl:apply-templates select="tfoot"/>
<xsl:if test=".//footnote">
<tr>
@@ -278,16 +320,9 @@
</xsl:choose>
</xsl:variable>
- <xsl:call-template name="add-empty-entries">
- <xsl:with-param name="number">
- <xsl:choose>
- <xsl:when test="$prev.ending.colnum = ''">0</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$entry.colnum - $prev.ending.colnum - 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
+ <!-- 1.31: removed add-empty-entries; there's no practical way for
+ XSLT to keep track of "overhang" from morerows in previous rows.
+ At least none that I can think of. -->
</xsl:if>
<xsl:element name="{$cellgi}">
@@ -342,38 +377,6 @@
</xsl:element>
</xsl:template>
-<xsl:template name="add-empty-entries">
- <xsl:param name="number" select="'0'"/>
- <xsl:choose>
- <xsl:when test="$number &lt;= 0"></xsl:when>
- <xsl:otherwise>
- <td>&#160;</td>
- <xsl:call-template name="add-empty-entries">
- <xsl:with-param name="number" select="$number - 1"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<doc:template name="add-empty-entries" xmlns="">
-<refpurpose>Insert empty TDs into a table row</refpurpose>
-<refdescription>
-<para>This template inserts empty TDs into a table row.</para>
-</refdescription>
-<refparameter>
-<variablelist>
-<varlistentry><term>number</term>
-<listitem>
-<para>The number of empty TDs to add.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-<refreturn>
-<para>Nothing</para>
-</refreturn>
-</doc:template>
-
<xsl:template name="entry.colnum">
<xsl:param name="entry" select="."/>
@@ -529,17 +532,27 @@ or nothing (the empty string)</para>
<xsl:when test="$colspec.colnum=$countcol">
<col>
<xsl:if test="$colspec/@colwidth
- and $saxon.extensions != 0
- and $saxon.tablecolumns != 0">
+ and $use.extensions != 0
+ and $tablecolumns.extension != 0">
<xsl:attribute name="width">
<xsl:value-of select="$colspec/@colwidth"/>
</xsl:attribute>
</xsl:if>
- <xsl:if test="$colspec/@align">
- <xsl:attribute name="align">
- <xsl:value-of select="$colspec/@align"/>
- </xsl:attribute>
- </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="$colspec/@align">
+ <xsl:attribute name="align">
+ <xsl:value-of select="$colspec/@align"/>
+ </xsl:attribute>
+ </xsl:when>
+ <!-- Suggested by Pavel ZAMPACH <zampach@nemcb.cz> -->
+ <xsl:when test="$colspecs/ancestor::tgroup/@align">
+ <xsl:attribute name="align">
+ <xsl:value-of select="$colspecs/ancestor::tgroup/@align"/>
+ </xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:if test="$colspec/@char">
<xsl:attribute name="char">
<xsl:value-of select="$colspec/@char"/>
diff --git a/tests/docbook/html/titlepage.templates.xml b/tests/docbook/html/titlepage.templates.xml
index 918ebfba..f872e895 100644
--- a/tests/docbook/html/titlepage.templates.xml
+++ b/tests/docbook/html/titlepage.templates.xml
@@ -6,8 +6,8 @@
<t:titlepage element="article" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -38,8 +38,8 @@
<t:titlepage element="set" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -70,8 +70,8 @@
<t:titlepage element="book" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -102,8 +102,8 @@
<t:titlepage element="part" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -131,8 +131,8 @@
<t:titlepage element="partintro" wrapper="div">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -162,8 +162,8 @@
<t:titlepage element="reference" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -194,11 +194,11 @@
<t:titlepage element="dedication" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"
- force="1"
- named-template="component.title"
- param:node="ancestor-or-self::dedication[1]"/>
- <subtitle predicate="[1]"/>
+ <title
+ force="1"
+ named-template="component.title"
+ param:node="ancestor-or-self::dedication[1]"/>
+ <subtitle/>
</t:titlepage-content>
<t:titlepage-content side="verso">
@@ -218,11 +218,8 @@
<t:titlepage element="preface" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"
- force="1"
- named-template="component.title"
- param:node="ancestor-or-self::preface[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -252,8 +249,8 @@
<t:titlepage element="chapter" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -283,8 +280,8 @@
<t:titlepage element="appendix" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -314,8 +311,8 @@
<t:titlepage element="section" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -344,8 +341,8 @@
<t:titlepage element="sect1" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -374,8 +371,8 @@
<t:titlepage element="sect2" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -404,8 +401,8 @@
<t:titlepage element="sect3" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -434,8 +431,8 @@
<t:titlepage element="sect4" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -464,8 +461,8 @@
<t:titlepage element="sect5" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -494,8 +491,8 @@
<t:titlepage element="simplesect" wrapper="div" class="titlepage">
<t:titlepage-content side="recto">
- <title predicate="[1]"/>
- <subtitle predicate="[1]"/>
+ <title/>
+ <subtitle/>
<corpauthor/>
<authorgroup/>
<author/>
@@ -524,4 +521,76 @@
<!-- ==================================================================== -->
+<t:titlepage element="bibliography" wrapper="div" class="titlepage">
+ <t:titlepage-content side="recto">
+ <title
+ force="1"
+ named-template="component.title"
+ param:node="ancestor-or-self::bibliography[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage element="glossary" wrapper="div" class="titlepage">
+ <t:titlepage-content side="recto">
+ <title
+ force="1"
+ named-template="component.title"
+ param:node="ancestor-or-self::glossary[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage element="index" wrapper="div" class="titlepage">
+ <t:titlepage-content side="recto">
+ <title
+ force="1"
+ named-template="component.title"
+ param:node="ancestor-or-self::index[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
</t:templates>
diff --git a/tests/docbook/html/titlepage.templates.xsl b/tests/docbook/html/titlepage.templates.xsl
index e6f6ca8f..8d222678 100644
--- a/tests/docbook/html/titlepage.templates.xsl
+++ b/tests/docbook/html/titlepage.templates.xsl
@@ -3,18 +3,50 @@
<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
<xsl:template name="article.titlepage.recto">
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="(articleinfo/title|artheader/title|title)[1]"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="(articleinfo/subtitle|artheader/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor|artheader/corpauthor"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup|artheader/authorgroup"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author|artheader/author"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo|artheader/releaseinfo"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright|artheader/copyright"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice|artheader/legalnotice"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate|artheader/pubdate"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision|artheader/revision"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory|artheader/revhistory"/>
- <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract|artheader/abstract"/>
+ <xsl:choose>
+ <xsl:when test="articleinfo/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
+ </xsl:when>
+ <xsl:when test="artheader/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="articleinfo/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="artheader/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
</xsl:template>
<xsl:template name="article.titlepage.verso">
@@ -124,8 +156,24 @@
</xsl:template>
<xsl:template name="set.titlepage.recto">
- <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="(setinfo/title|title)[1]"/>
- <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="(setinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="setinfo/title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="setinfo/subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
<xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
@@ -245,8 +293,24 @@
</xsl:template>
<xsl:template name="book.titlepage.recto">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="(bookinfo/title|title)[1]"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="(bookinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="bookinfo/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="bookinfo/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
@@ -366,18 +430,50 @@
</xsl:template>
<xsl:template name="part.titlepage.recto">
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="(partinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="(partinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="partinfo/title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="partinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="part.titlepage.verso">
@@ -487,18 +583,50 @@
</xsl:template>
<xsl:template name="partintro.titlepage.recto">
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="(partintroinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="(partintroinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="partintroinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="partintroinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="partintro.titlepage.verso">
@@ -608,18 +736,50 @@
</xsl:template>
<xsl:template name="reference.titlepage.recto">
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="(referenceinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="(referenceinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="referenceinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="referenceinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="reference.titlepage.verso">
@@ -733,7 +893,18 @@
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
</xsl:call-template></div>
- <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="(dedicationinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="dedicationinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="dedication.titlepage.verso">
@@ -777,21 +948,50 @@
</xsl:template>
<xsl:template name="preface.titlepage.recto">
- <div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
-</xsl:call-template></div>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="(prefaceinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="prefaceinfo/title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="prefaceinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="preface.titlepage.verso">
@@ -828,6 +1028,12 @@
<xsl:apply-templates select="." mode="titlepage.mode"/>
</xsl:template>
+<xsl:template match="title" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="preface.titlepage.recto.style">
<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
@@ -895,18 +1101,50 @@
</xsl:template>
<xsl:template name="chapter.titlepage.recto">
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="(chapterinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="(chapterinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="chapterinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="chapterinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="chapter.titlepage.verso">
@@ -1016,18 +1254,50 @@
</xsl:template>
<xsl:template name="appendix.titlepage.recto">
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="(appendixinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="(appendixinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="appendixinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="appendixinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="appendix.titlepage.verso">
@@ -1137,8 +1407,24 @@
</xsl:template>
<xsl:template name="section.titlepage.recto">
- <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="(sectioninfo/title|title)[1]"/>
- <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="(sectioninfo/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sectioninfo/title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sectioninfo/subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
<xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
@@ -1258,8 +1544,24 @@
</xsl:template>
<xsl:template name="sect1.titlepage.recto">
- <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="(sect1info/title|title)[1]"/>
- <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="(sect1info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect1info/title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect1info/subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
<xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
@@ -1379,8 +1681,24 @@
</xsl:template>
<xsl:template name="sect2.titlepage.recto">
- <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="(sect2info/title|title)[1]"/>
- <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="(sect2info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect2info/title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect2info/subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
<xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
@@ -1500,8 +1818,24 @@
</xsl:template>
<xsl:template name="sect3.titlepage.recto">
- <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="(sect3info/title|title)[1]"/>
- <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="(sect3info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect3info/title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect3info/subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
<xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
@@ -1621,8 +1955,24 @@
</xsl:template>
<xsl:template name="sect4.titlepage.recto">
- <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="(sect4info/title|title)[1]"/>
- <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="(sect4info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect4info/title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect4info/subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
<xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
@@ -1742,8 +2092,24 @@
</xsl:template>
<xsl:template name="sect5.titlepage.recto">
- <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="(sect5info/title|title)[1]"/>
- <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="(sect5info/subtitle|subtitle)[1]"/>
+ <xsl:choose>
+ <xsl:when test="sect5info/title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect5info/subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
<xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
@@ -1863,18 +2229,50 @@
</xsl:template>
<xsl:template name="simplesect.titlepage.recto">
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="(simplesectinfo/title|docinfo/title|title)[1]"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="(simplesectinfo/subtitle|docinfo/subtitle|subtitle)[1]"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor|docinfo/corpauthor"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup|docinfo/authorgroup"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author|docinfo/author"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo|docinfo/releaseinfo"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright|docinfo/copyright"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice|docinfo/legalnotice"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate|docinfo/pubdate"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision|docinfo/revision"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory|docinfo/revhistory"/>
- <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract|docinfo/abstract"/>
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
</xsl:template>
<xsl:template name="simplesect.titlepage.verso">
@@ -1983,4 +2381,181 @@
</div>
</xsl:template>
+<xsl:template name="bibliography.titlepage.recto">
+ <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="bibliographyinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage">
+ <div class="titlepage">
+ <xsl:call-template name="bibliography.titlepage.before.recto"/>
+ <xsl:call-template name="bibliography.titlepage.recto"/>
+ <xsl:call-template name="bibliography.titlepage.before.verso"/>
+ <xsl:call-template name="bibliography.titlepage.verso"/>
+ <xsl:call-template name="bibliography.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.recto">
+ <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="glossaryinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage">
+ <div class="titlepage">
+ <xsl:call-template name="glossary.titlepage.before.recto"/>
+ <xsl:call-template name="glossary.titlepage.recto"/>
+ <xsl:call-template name="glossary.titlepage.before.verso"/>
+ <xsl:call-template name="glossary.titlepage.verso"/>
+ <xsl:call-template name="glossary.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="index.titlepage.recto">
+ <div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="indexinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="index.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage">
+ <div class="titlepage">
+ <xsl:call-template name="index.titlepage.before.recto"/>
+ <xsl:call-template name="index.titlepage.recto"/>
+ <xsl:call-template name="index.titlepage.before.verso"/>
+ <xsl:call-template name="index.titlepage.verso"/>
+ <xsl:call-template name="index.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
</xsl:stylesheet> \ No newline at end of file
diff --git a/tests/docbook/html/titlepage.xsl b/tests/docbook/html/titlepage.xsl
index f2da969d..6527f887 100644
--- a/tests/docbook/html/titlepage.xsl
+++ b/tests/docbook/html/titlepage.xsl
@@ -44,6 +44,15 @@
<xsl:attribute-set name="appendix.titlepage.recto.style"/>
<xsl:attribute-set name="appendix.titlepage.verso.style"/>
+<xsl:attribute-set name="bibliography.titlepage.recto.style"/>
+<xsl:attribute-set name="bibliography.titlepage.verso.style"/>
+
+<xsl:attribute-set name="glossary.titlepage.recto.style"/>
+<xsl:attribute-set name="glossary.titlepage.verso.style"/>
+
+<xsl:attribute-set name="index.titlepage.recto.style"/>
+<xsl:attribute-set name="index.titlepage.verso.style"/>
+
<xsl:attribute-set name="section.titlepage.recto.style"/>
<xsl:attribute-set name="section.titlepage.verso.style"/>
@@ -113,7 +122,7 @@
<div class="{name(.)}">
<xsl:call-template name="formal.object.heading">
<xsl:with-param name="title">
- <xsl:apply-templates select="." mode="title.ref"/>
+ <xsl:apply-templates select="." mode="title.markup"/>
</xsl:with-param>
</xsl:call-template>
<xsl:apply-templates mode="titlepage.mode"/>
@@ -124,10 +133,7 @@
</xsl:template>
<xsl:template match="address" mode="titlepage.mode">
-<!-- this won't do quite what's desired... -->
- <pre class="{name(.)}">
- <xsl:apply-templates mode="titlepage.mode"/>
- </pre>
+ <xsl:apply-templates select="."/>
</xsl:template>
<xsl:template match="affiliation" mode="titlepage.mode">
@@ -152,7 +158,7 @@
<div class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
</div>
-</xsl:template>
+</xsl:template>
<xsl:template match="authorgroup" mode="titlepage.mode">
<xsl:apply-templates mode="titlepage.mode"/>
@@ -181,12 +187,29 @@
</xsl:template>
<xsl:template match="confgroup" mode="titlepage.mode">
+ <div class="{name(.)}">
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="confdates" mode="titlepage.mode">
<span class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
<br/>
</span>
</xsl:template>
+<xsl:template match="conftitle" mode="titlepage.mode">
+ <span class="{name(.)}">
+ <xsl:apply-templates mode="titlepage.mode"/>
+ <br/>
+ </span>
+</xsl:template>
+
+<xsl:template match="confnum" mode="titlepage.mode">
+ <!-- suppress -->
+</xsl:template>
+
<xsl:template match="contractnum" mode="titlepage.mode">
<span class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
@@ -213,7 +236,9 @@
<xsl:variable name="holders" select="holder"/>
<p class="{name(.)}">
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Copyright'"/>
+ </xsl:call-template>
<xsl:call-template name="gentext.space"/>
<xsl:call-template name="dingbat">
<xsl:with-param name="dingbat">copyright</xsl:with-param>
@@ -221,8 +246,10 @@
<xsl:call-template name="gentext.space"/>
<xsl:apply-templates select="$years" mode="titlepage.mode"/>
<xsl:call-template name="gentext.space"/>
+<!--
<xsl:call-template name="gentext.by"/>
<xsl:call-template name="gentext.space"/>
+-->
<xsl:apply-templates select="$holders" mode="titlepage.mode"/>
</p>
</xsl:template>
@@ -262,8 +289,10 @@
<xsl:template match="edition" mode="titlepage.mode">
<p class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
- <xsl:text> </xsl:text>
- <xsl:call-template name="gentext.element.name"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Edition'"/>
+ </xsl:call-template>
</p>
</xsl:template>
@@ -416,6 +445,12 @@
</p>
</xsl:template>
+<xsl:template match="publisher" mode="titlepage.mode">
+ <p class="{name(.)}">
+ <xsl:apply-templates mode="titlepage.mode"/>
+ </p>
+</xsl:template>
+
<xsl:template match="publishername" mode="titlepage.mode">
<span class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
@@ -431,10 +466,9 @@
</xsl:template>
<xsl:template match="releaseinfo" mode="titlepage.mode">
- <span class="{name(.)}">
+ <p class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
- <br/>
- </span>
+ </p>
</xsl:template>
<xsl:template match="revhistory" mode="titlepage.mode">
@@ -449,7 +483,11 @@
<table border="1" width="100%" summary="Revision history">
<tr>
<th align="left" valign="top" colspan="{$numcols}">
- <b><xsl:call-template name="gentext.element.name"/></b>
+ <b>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'RevHistory'"/>
+ </xsl:call-template>
+ </b>
</th>
</tr>
<xsl:apply-templates mode="titlepage.mode">
@@ -468,8 +506,10 @@
<tr>
<td align="left">
<xsl:if test="$revnumber">
- <xsl:call-template name="gentext.element.name"/>
- <xsl:text> </xsl:text>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Revision'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
<xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
</xsl:if>
</td>
@@ -580,12 +620,9 @@
</xsl:template>
<xsl:template match="titleabbrev" mode="titlepage.mode">
- <span class="{name(.)}">
- <xsl:apply-templates mode="titlepage.mode"/>
- <br/>
- </span>
+ <!-- nop; title abbreviations don't belong on the title page! -->
</xsl:template>
-
+
<xsl:template match="volumenum" mode="titlepage.mode">
<span class="{name(.)}">
<xsl:apply-templates mode="titlepage.mode"/>
diff --git a/tests/docbook/html/toc.xsl b/tests/docbook/html/toc.xsl
index 55d47162..f33a1a14 100644
--- a/tests/docbook/html/toc.xsl
+++ b/tests/docbook/html/toc.xsl
@@ -15,12 +15,154 @@
<!-- ==================================================================== -->
<xsl:template match="toc">
+ <xsl:choose>
+ <xsl:when test="*">
+ <xsl:if test="$process.source.toc != 0">
+ <!-- if the toc isn't empty, process it -->
+ <xsl:element name="{$toc.list.type}">
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$process.empty.source.toc != 0">
+ <xsl:choose>
+ <xsl:when test="parent::section
+ or parent::sect1
+ or parent::sect2
+ or parent::sect3
+ or parent::sect4
+ or parent::sect5">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.section"/>
+ </xsl:when>
+ <xsl:when test="parent::article">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.component"/>
+ </xsl:when>
+ <xsl:when test="parent::book
+ or parent::part">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.division"/>
+ </xsl:when>
+ <xsl:when test="parent::set">
+ <xsl:apply-templates select="parent::*"
+ mode="toc.for.set"/>
+ </xsl:when>
+ <!-- there aren't any other contexts that allow toc -->
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
-<xsl:template match="tocpart|tocchap|tocfront|tocback|tocentry">
+<xsl:template match="tocpart|tocchap
+ |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
+ <xsl:variable name="sub-toc">
+ <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
+ <xsl:choose>
+ <xsl:when test="$toc.list.type = 'dl'">
+ <dd>
+ <xsl:element name="{$toc.list.type}">
+ <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
+ </xsl:element>
+ </dd>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="{$toc.list.type}">
+ <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:apply-templates select="tocentry[position() != last()]"/>
+
+ <xsl:choose>
+ <xsl:when test="$toc.list.type = 'dl'">
+ <dt>
+ <xsl:apply-templates select="tocentry[position() = last()]"/>
+ </dt>
+ <xsl:copy-of select="$sub-toc"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <li>
+ <xsl:apply-templates select="tocentry[position() = last()]"/>
+ <xsl:copy-of select="$sub-toc"/>
+ </li>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="tocentry|tocfront|tocback">
+ <xsl:choose>
+ <xsl:when test="$toc.list.type = 'dl'">
+ <dt>
+ <xsl:call-template name="tocentry-content"/>
+ </dt>
+ </xsl:when>
+ <xsl:otherwise>
+ <li>
+ <xsl:call-template name="tocentry-content"/>
+ </li>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="tocentry[position() = last()]" priority="2">
+ <xsl:call-template name="tocentry-content"/>
+</xsl:template>
+
+<xsl:template name="tocentry-content">
+ <xsl:variable name="targets" select="id(@linkend)"/>
+ <xsl:variable name="target" select="$targets[1]"/>
+
+ <xsl:choose>
+ <xsl:when test="@linkend">
+ <xsl:call-template name="check.id.unique">
+ <xsl:with-param name="linkend" select="@linkend"/>
+ </xsl:call-template>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="object" select="$target"/>
+ </xsl:call-template>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="*" mode="toc.for.section">
+ <xsl:call-template name="section.toc"/>
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.component">
+ <xsl:call-template name="component.toc"/>
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.section">
+ <xsl:call-template name="section.toc"/>
+</xsl:template>
+
+<xsl:template match="*" mode="toc.for.division">
+ <xsl:call-template name="division.toc"/>
</xsl:template>
-<xsl:template match="toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
+<xsl:template match="*" mode="toc.for.set">
+ <xsl:call-template name="set.toc"/>
</xsl:template>
<!-- ==================================================================== -->
diff --git a/tests/docbook/html/verbatim.xsl b/tests/docbook/html/verbatim.xsl
index 58a051cb..bfaa1578 100644
--- a/tests/docbook/html/verbatim.xsl
+++ b/tests/docbook/html/verbatim.xsl
@@ -1,8 +1,9 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:verb5="http://nwalsh.com/com.nwalsh.saxon.Verbatim"
- xmlns:verb6="http://nwalsh.com/com.nwalsh.saxon6.Verbatim"
- exclude-result-prefixes="verb5 verb6"
+ xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
+ xmlns:xverb="com.nwalsh.xalan.Verbatim"
+ xmlns:lxslt="http://xml.apache.org/xslt"
+ exclude-result-prefixes="sverb xverb lxslt"
version='1.0'>
<!-- ********************************************************************
@@ -15,53 +16,14 @@
******************************************************************** -->
+<lxslt:component prefix="xverb"
+ functions="numberLines"/>
+
<xsl:template match="programlisting|screen|synopsis">
<xsl:param name="suppress-numbers" select="'0'"/>
<xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
<xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
- <!-- Obey the <?dbhtml linenumbering.everyNth="x"?> PI -->
- <xsl:variable name="default.linenumbering.everyNth"
- select="$linenumbering.everyNth"/>
-
- <xsl:variable name="pi.linenumbering.everyNth">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="attribute" select="'everyNth'"/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="linenumbering.everyNth">
- <xsl:choose>
- <xsl:when test="$pi.linenumbering.everyNth != ''">
- <xsl:value-of select="$pi.linenumbering.everyNth"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$default.linenumbering.everyNth"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <!-- Obey the <?dbhtml linenumbering.separator="x"?> PI -->
- <xsl:variable name="default.linenumbering.separator"
- select="$linenumbering.separator"/>
-
- <xsl:variable name="pi.linenumbering.separator">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="linenumbering.separator">
- <xsl:choose>
- <xsl:when test="$pi.linenumbering.separator != ''">
- <xsl:value-of select="$pi.linenumbering.separator"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$default.linenumbering.separator"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:if test="@id">
<a href="{$id}"/>
</xsl:if>
@@ -69,23 +31,15 @@
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<xsl:variable name="rtf">
<xsl:apply-templates/>
</xsl:variable>
<pre class="{name(.)}">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</pre>
</xsl:when>
<xsl:otherwise>
@@ -107,41 +61,26 @@
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<xsl:choose>
<xsl:when test="@class='monospaced'">
<pre class="{name(.)}">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</pre>
</xsl:when>
<xsl:otherwise>
<div class="{name(.)}">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</div>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
+
<xsl:otherwise>
<xsl:choose>
<xsl:when test="@class='monospaced'">
@@ -177,22 +116,15 @@
<xsl:choose>
<xsl:when test="$suppress-numbers = '0'
and @linenumbering = 'numbered'
- and $saxon.extensions != '0'
- and $saxon.linenumbering != '0'">
+ and $use.extensions != '0'
+ and $linenumbering.extension != '0'">
<div class="{name(.)}">
- <xsl:choose>
- <xsl:when test="contains($vendor, 'SAXON 6')">
- <xsl:copy-of select="verb6:numberLines($rtf)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="verb5:numberLines($rtf,
- $linenumbering.everyNth,
- $linenumbering.width,
- $linenumbering.separator)"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:call-template name="number.rtf.lines">
+ <xsl:with-param name="rtf" select="$rtf"/>
+ </xsl:call-template>
</div>
</xsl:when>
+
<xsl:otherwise>
<div class="{name(.)}">
<xsl:apply-templates/>
@@ -201,6 +133,97 @@
</xsl:choose>
</xsl:template>
+<xsl:template name="number.rtf.lines">
+ <xsl:param name="rtf" select="''"/>
+ <xsl:param name="pi.context" select="."/>
+
+ <!-- Save the global values -->
+ <xsl:variable name="global.linenumbering.everyNth"
+ select="$linenumbering.everyNth"/>
+
+ <xsl:variable name="global.linenumbering.separator"
+ select="$linenumbering.separator"/>
+
+ <xsl:variable name="global.linenumbering.width"
+ select="$linenumbering.width"/>
+
+ <!-- Extract the <?dbhtml linenumbering.*?> PI values -->
+ <xsl:variable name="pi.linenumbering.everyNth">
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:variable name="pi.linenumbering.separator">
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:variable name="pi.linenumbering.width">
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis"
+ select="$pi.context/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- Construct the 'in-context' values -->
+ <xsl:variable name="linenumbering.everyNth">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.everyNth != ''">
+ <xsl:value-of select="$pi.linenumbering.everyNth"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.everyNth"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="linenumbering.separator">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.separator != ''">
+ <xsl:value-of select="$pi.linenumbering.separator"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.separator"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="linenumbering.width">
+ <xsl:choose>
+ <xsl:when test="$pi.linenumbering.width != ''">
+ <xsl:value-of select="$pi.linenumbering.width"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$global.linenumbering.width"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
+
+ <xsl:choose>
+ <xsl:when test="contains($vendor, 'SAXON ')">
+ <xsl:copy-of select="sverb:numberLines($rtf)"/>
+ </xsl:when>
+ <xsl:when test="contains($vendor, 'Apache Software Foundation')">
+ <xsl:copy-of select="xverb:numberLines($rtf)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Don't know how to do line numbering with </xsl:text>
+ <xsl:value-of select="$vendor"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
<xsl:template match="address//text()">
<xsl:call-template name="make-verbatim">
<xsl:with-param name="text" select="."/>
diff --git a/tests/docbook/html/xref.xsl b/tests/docbook/html/xref.xsl
index b0efbe6e..c367dc39 100644
--- a/tests/docbook/html/xref.xsl
+++ b/tests/docbook/html/xref.xsl
@@ -40,7 +40,7 @@
</xsl:if>
<xsl:choose>
- <xsl:when test="$refelem=''">
+ <xsl:when test="count($target) = 0">
<xsl:message>
<xsl:text>XRef to nonexistent id: </xsl:text>
<xsl:value-of select="@linkend"/>
@@ -89,164 +89,12 @@
</xsl:when>
<xsl:otherwise>
- <xsl:apply-templates select="$target" mode="xref-to"/>
- </xsl:otherwise>
-<!--
- <xsl:when test="$refelem='figure'">
- <xsl:call-template name="xref.figure">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='example'">
- <xsl:call-template name="xref.example">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='table'">
- <xsl:call-template name="xref.table">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='equation'">
- <xsl:call-template name="xref.equation">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='cmdsynopsis'">
- <xsl:call-template name="xref.cmdsynopsis">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='funcsynopsis'">
- <xsl:call-template name="xref.funcsynopsis">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='dedication'">
- <xsl:call-template name="xref.dedication">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='preface'">
- <xsl:call-template name="xref.preface">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='chapter'">
- <xsl:call-template name="xref.chapter">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='appendix'">
- <xsl:call-template name="xref.appendix">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='bibliography'">
- <xsl:call-template name="xref.bibliography">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='biblioentry'">
- <xsl:call-template name="xref.biblioentry">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='bibliomixed'">
- <xsl:call-template name="xref.biblioentry">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='glossary'">
- <xsl:call-template name="xref.glossary">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='index'">
- <xsl:call-template name="xref.index">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='section'
- or $refelem='simplesect'
- or $refelem='sect1'
- or $refelem='sect2'
- or $refelem='sect3'
- or $refelem='sect4'
- or $refelem='sect5'
- or $refelem='refsect1'
- or $refelem='refsect2'
- or $refelem='refsect3'">
- <xsl:call-template name="xref.section">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='listitem'
- and local-name($target/..)='orderedlist'">
- <xsl:apply-templates select="$target" mode="xref"/>
- </xsl:when>
-
- <xsl:when test="$refelem='question'">
- <xsl:call-template name="xref.question">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='answer'">
- <xsl:call-template name="xref.answer">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='part'">
- <xsl:call-template name="xref.part">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='reference'">
- <xsl:call-template name="xref.reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='co'">
- <xsl:call-template name="xref.co">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
-
- <xsl:when test="$refelem='book'">
- <xsl:call-template name="xref.book">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
- </xsl:when>
+ <xsl:attribute name="title">
+ <xsl:apply-templates select="$target" mode="xref-title"/>
+ </xsl:attribute>
- <xsl:otherwise>
- <xsl:message>
- <xsl:text>[Don't know what gentext to create for xref to: "</xsl:text>
- <xsl:value-of select="$refelem"/>
- <xsl:text>"]</xsl:text>
- </xsl:message>
- <xsl:text>???</xsl:text>
+ <xsl:apply-templates select="$target" mode="xref-to"/>
</xsl:otherwise>
--->
</xsl:choose>
</a>
</xsl:otherwise>
@@ -255,149 +103,72 @@
<!-- ==================================================================== -->
-<xsl:template name="cross-reference">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
- <xsl:param name="xref.text">
- <xsl:call-template name="gentext.xref.text">
- <xsl:with-param name="element.name" select="$refelem"/>
- <xsl:with-param name="default">%g %n</xsl:with-param>
- </xsl:call-template>
- </xsl:param>
-
- <xsl:call-template name="subst.xref.text">
- <xsl:with-param name="xref.text" select="$xref.text"/>
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
-</xsl:template>
-
<xsl:template match="*" mode="xref-to">
<xsl:param name="target" select="."/>
<xsl:param name="refelem" select="local-name($target)"/>
<xsl:message>
- <xsl:text>[Don't know what gentext to create for xref to: "</xsl:text>
+ <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
<xsl:value-of select="$refelem"/>
- <xsl:text>"]</xsl:text>
+ <xsl:text>"</xsl:text>
</xsl:message>
<xsl:text>???</xsl:text>
</xsl:template>
<xsl:template match="author" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
<xsl:call-template name="person.name"/>
</xsl:template>
<xsl:template match="figure" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="example" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="table" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="equation" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="cmdsynopsis" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:variable name="command" select="($target//command)[1]"/>
-
- <xsl:apply-templates select="$command" mode="xref"/>
+ <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
</xsl:template>
<xsl:template match="funcsynopsis" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:variable name="func" select="($target//function)[1]"/>
-
- <xsl:apply-templates select="$func" mode="xref"/>
+ <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
</xsl:template>
<xsl:template match="dedication" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="preface" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="chapter" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="appendix" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="bibliography" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
<!-- handles both biblioentry and bibliomixed -->
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
<xsl:text>[</xsl:text>
<xsl:choose>
- <xsl:when test="local-name($target/*[1]) = 'abbrev'">
- <xsl:apply-templates select="$target/*[1]"/>
+ <xsl:when test="local-name(*[1]) = 'abbrev'">
+ <xsl:apply-templates select="*[1]"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@id"/>
@@ -407,116 +178,102 @@
</xsl:template>
<xsl:template match="glossary" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="index" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="section|simplesect
|sect1|sect2|sect3|sect4|sect5
|refsect1|refsect2|refsect3" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:choose>
- <xsl:when test="$section.autolabel">
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name" select="$refelem"/>
- </xsl:call-template>
- <xsl:text> </xsl:text>
- <xsl:apply-templates select="$target" mode="label.content"/>
-
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="gentext.element.name">
- <xsl:with-param name="element.name">the section called</xsl:with-param>
- </xsl:call-template>
- <xsl:text> </xsl:text>
- <xsl:call-template name="gentext.startquote"/>
- <xsl:apply-templates select="$target" mode="title.content"/>
- <xsl:call-template name="gentext.endquote"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
+ <!-- What about "in Chapter X"? -->
</xsl:template>
<xsl:template match="question" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="answer" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="part" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="reference" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
-
- <xsl:call-template name="cross-reference">
- <xsl:with-param name="target" select="$target"/>
- </xsl:call-template>
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
<xsl:template match="co" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
- <xsl:apply-templates select="$target" mode="callout-bug"/>
+ <xsl:apply-templates select="." mode="callout-bug"/>
</xsl:template>
-<xsl:template match="co" mode="conumber">
- <xsl:number from="literallayout|programlisting|screen|synopsis"
- level="single"
- format="1"/>
+<xsl:template match="book" mode="xref-to">
+ <xsl:apply-templates select="." mode="object.xref.markup"/>
</xsl:template>
-<xsl:template match="book" mode="xref-to">
- <xsl:param name="target" select="."/>
- <xsl:param name="refelem" select="local-name($target)"/>
+<!-- ==================================================================== -->
+
+<xsl:template match="*" mode="xref-title">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </xsl:variable>
+
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="author" mode="xref-title">
+ <xsl:variable name="title">
+ <xsl:call-template name="person.name"/>
+ </xsl:variable>
+
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="cmdsynopsis" mode="xref-title">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
+ </xsl:variable>
+
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="funcsynopsis" mode="xref-title">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
+ </xsl:variable>
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="biblioentry|bibliomixed" mode="xref-title">
+ <!-- handles both biblioentry and bibliomixed -->
<xsl:variable name="title">
+ <xsl:text>[</xsl:text>
<xsl:choose>
- <xsl:when test="$target/title">
- <xsl:apply-templates select="$target/title" mode="xref"/>
+ <xsl:when test="local-name(*[1]) = 'abbrev'">
+ <xsl:apply-templates select="*[1]"/>
</xsl:when>
<xsl:otherwise>
- <xsl:apply-templates select="$target/bookinfo/title"
- mode="xref"/>
+ <xsl:value-of select="@id"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:text>]</xsl:text>
+ </xsl:variable>
+
+ <xsl:value-of select="$title"/>
+</xsl:template>
+
+<xsl:template match="co" mode="xref-title">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="callout-bug"/>
</xsl:variable>
- <i>
- <xsl:copy-of select="$title"/>
- </i>
+
+ <xsl:value-of select="$title"/>
</xsl:template>
<!-- ==================================================================== -->
@@ -540,6 +297,31 @@
</xsl:call-template>
</xsl:attribute>
+ <!-- FIXME: is there a better way to tell what elements have a title? -->
+ <xsl:if test="local-name($target) = 'book'
+ or local-name($target) = 'set'
+ or local-name($target) = 'chapter'
+ or local-name($target) = 'preface'
+ or local-name($target) = 'appendix'
+ or local-name($target) = 'bibliography'
+ or local-name($target) = 'glossary'
+ or local-name($target) = 'index'
+ or local-name($target) = 'part'
+ or local-name($target) = 'refentry'
+ or local-name($target) = 'reference'
+ or local-name($target) = 'example'
+ or local-name($target) = 'equation'
+ or local-name($target) = 'table'
+ or local-name($target) = 'figure'
+ or local-name($target) = 'simplesect'
+ or starts-with(local-name($target),'sect')
+ or starts-with(local-name($target),'refsect')">
+ <xsl:attribute name="title">
+ <xsl:apply-templates select="$target"
+ mode="object.title.markup.textonly"/>
+ </xsl:attribute>
+ </xsl:if>
+
<xsl:apply-templates/>
</a>
</xsl:template>
@@ -575,39 +357,6 @@
<!-- ==================================================================== -->
-<xsl:template name="title.xref">
- <xsl:param name="target" select="."/>
- <xsl:choose>
- <xsl:when test="local-name($target) = 'figure'
- or local-name($target) = 'example'
- or local-name($target) = 'equation'
- or local-name($target) = 'table'
- or local-name($target) = 'dedication'
- or local-name($target) = 'preface'
- or local-name($target) = 'bibliography'
- or local-name($target) = 'glossary'
- or local-name($target) = 'index'
- or local-name($target) = 'setindex'
- or local-name($target) = 'colophon'">
- <xsl:call-template name="gentext.startquote"/>
- <xsl:apply-templates select="$target" mode="title.content"/>
- <xsl:call-template name="gentext.endquote"/>
- </xsl:when>
- <xsl:otherwise>
- <i>
- <xsl:apply-templates select="$target" mode="title.content"/>
- </i>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.xref">
- <xsl:param name="target" select="."/>
- <xsl:apply-templates select="$target" mode="label.content"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
<xsl:template name="xref.xreflabel">
<!-- called to process an xreflabel...you might use this to make -->
<!-- xreflabels come out in the right font for different targets, -->
diff --git a/tests/docbook/html/xtchunk.xsl b/tests/docbook/html/xtchunk.xsl
index aeb41b56..15f249fb 100644
--- a/tests/docbook/html/xtchunk.xsl
+++ b/tests/docbook/html/xtchunk.xsl
@@ -3,34 +3,8 @@
extension-element-prefixes="xt"
version="1.0">
+<xsl:import href="docbook.xsl"/>
<xsl:include href="chunk-common.xsl"/>
-
-<xsl:template name="make-relative-filename">
- <xsl:param name="base.dir" select="'./'"/>
- <xsl:param name="base.name" select="''"/>
-
- <!-- XT makes chunks relative -->
- <xsl:choose>
- <xsl:when test="count(parent::*) = 0">
- <xsl:value-of select="concat($base.dir,$base.name)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$base.name"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
- <xsl:param name="filename" select="''"/>
- <xsl:param name="method" select="'html'"/>
- <xsl:param name="encoding" select="'ISO-8859-1'"/>
- <xsl:param name="content" select="''"/>
-
- <xt:document href="{$filename}"
- method="{$method}"
- encoding="{$encoding}">
- <xsl:copy-of select="$content"/>
- </xt:document>
-</xsl:template>
+<xsl:include href="xtchunker.xsl"/>
</xsl:stylesheet> \ No newline at end of file
diff --git a/tests/docbook/html/xtchunker.xsl b/tests/docbook/html/xtchunker.xsl
new file mode 100644
index 00000000..62837df9
--- /dev/null
+++ b/tests/docbook/html/xtchunker.xsl
@@ -0,0 +1,70 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xt="http://www.jclark.com/xt"
+ extension-element-prefixes="xt"
+ version="1.0">
+
+<!-- This stylesheet works with XT; for others use chunker.xsl -->
+
+<!-- ==================================================================== -->
+
+<xsl:template name="make-relative-filename">
+ <xsl:param name="base.dir" select="'./'"/>
+ <xsl:param name="base.name" select="''"/>
+
+ <!-- XT makes chunks relative -->
+ <xsl:choose>
+ <xsl:when test="count(parent::*) = 0">
+ <xsl:value-of select="concat($base.dir,$base.name)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$base.name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="write.chunk">
+ <xsl:param name="filename" select="''"/>
+ <xsl:param name="method" select="'html'"/>
+ <xsl:param name="encoding" select="'ISO-8859-1'"/>
+ <xsl:param name="indent" select="'no'"/>
+ <xsl:param name="content" select="''"/>
+
+ <xsl:message>
+ <xsl:text>Writing </xsl:text>
+ <xsl:value-of select="$filename"/>
+ <xsl:if test="name(.) != ''">
+ <xsl:text> for </xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:if>
+ </xsl:message>
+
+ <!-- apparently XT doesn't support AVTs for method and encoding -->
+ <xsl:choose>
+ <xsl:when test="$method = 'xml'">
+ <xt:document href="{$filename}"
+ method="xml"
+ indent="{$indent}"
+ encoding="ISO-8859-1">
+ <xsl:copy-of select="$content"/>
+ </xt:document>
+ </xsl:when>
+ <xsl:when test="$method = 'text'">
+ <xt:document href="{$filename}"
+ method="text"
+ indent="{$indent}"
+ encoding="ISO-8859-1">
+ <xsl:copy-of select="$content"/>
+ </xt:document>
+ </xsl:when>
+ <xsl:otherwise>
+ <xt:document href="{$filename}"
+ method="html"
+ indent="{$indent}"
+ encoding="ISO-8859-1">
+ <xsl:copy-of select="$content"/>
+ </xt:document>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/htmlhelp/ChangeLog b/tests/docbook/htmlhelp/ChangeLog
new file mode 100644
index 00000000..e45182c4
--- /dev/null
+++ b/tests/docbook/htmlhelp/ChangeLog
@@ -0,0 +1,13 @@
+2001-05-05 Jirka Kosek <kosek@users.sourceforge.net>
+
+ * htmlhelp-common.xsl: Colophon is now included in toc.hhc
+
+2001-04-21 Jirka Kosek <kosek@users.sourceforge.net>
+
+ * README: Removed obsolete file
+
+2001-04-04 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * README, htmlhelp-common.xsl, htmlhelp.xsl, langcodes.xml, xthtmlhelp.xsl:
+ New file.
+
diff --git a/tests/docbook/htmlhelp/doc/ChangeLog b/tests/docbook/htmlhelp/doc/ChangeLog
new file mode 100644
index 00000000..faceafb0
--- /dev/null
+++ b/tests/docbook/htmlhelp/doc/ChangeLog
@@ -0,0 +1,8 @@
+2001-04-22 Jirka Kosek <kosek@users.sourceforge.net>
+
+ * htmlhelp.xml: Updated encoding issues for non-English languages
+
+2001-04-04 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * htmlhelp.xml: New file.
+
diff --git a/tests/docbook/htmlhelp/doc/htmlhelp.xml b/tests/docbook/htmlhelp/doc/htmlhelp.xml
new file mode 100644
index 00000000..1d7c4a3b
--- /dev/null
+++ b/tests/docbook/htmlhelp/doc/htmlhelp.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE chapter PUBLIC '-//OASIS//DTD DocBook XML V4.1.2//EN'
+ 'http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd'>
+<chapter lang="en">
+<chapterinfo>
+<author>
+<firstname>Jirka</firstname>
+<surname>Kosek</surname>
+</author>
+<copyright>
+<year>2001</year>
+<holder>Ji&rcaron;&iacute; Kosek</holder>
+</copyright>
+<releaseinfo>$Id$</releaseinfo>
+</chapterinfo>
+<title>Using XSL stylesheets to generate HTML Help</title>
+<?dbhtml filename="htmlhelp.html"?>
+
+<para>HTML Help (HH) is help-format used in newer versions of MS
+Windows and applications written for this platform. This format allows
+to pack several HTML files together with images, table of contents and
+index into single file. Windows contains browser for this file-format
+and full-text search is also supported on HH files. If you want know
+more about HH and its capabilities look at <ulink
+url="http://msdn.microsoft.com/library/tools/htmlhelp/chm/HH1Start.htm">HTML
+Help pages</ulink>.</para>
+
+<section>
+<title>How to generate first HTML Help file from DocBook sources</title>
+
+<para>Working with HH stylesheets is same as with other XSL DocBook
+stylesheets. Simply run your favorite XSLT processor on your document
+with stylesheet suited for HH:</para>
+
+<screen format="linespecific">saxon <replaceable>yourfile</replaceable> <replaceable>/path/to/stylesheets/</replaceable>contrib/htmlhelp/htmlhelp.xsl</screen>
+
+<para>If you are using XT processor, you should use stylesheet
+<filename moreinfo="none">xthtmlhelp.xsl</filename> instead of
+<filename moreinfo="none">htmlhelp.xsl</filename>.</para>
+
+<para>Stylesheet imports standard chunking stylesheet, thus set of
+HTML files is created in usual way. Other files are also created
+&ndash; <filename>htmlhelp.hhp</filename> is project file for HTML
+Help Compiler and <filename>toc.hhc</filename> holds structure of your
+document.</para>
+
+<para>Language identifier for whole HH file is taken from the top most
+element with <sgmltag class="attribute">lang</sgmltag> attribute in
+your DocBook source. This is perfectly legal for documents in only one
+language. If language is not specified in the document, US English is
+defaulted. There is one problem &ndash; MS language codes are country
+sensitive, and this information is not available in DocBook source. If
+the stylesheet selects bad code for you, edit
+<filename>langcodes.xml</filename>, and remove all entries which have
+yours language code, but are located in inappropriate country.</para>
+
+<para>Title of whole HH file is taken from first title element in your
+document. Fulltext searching is automatically on. If your document
+contains index terms, they are automatically converted to HH ActiveX
+objects, which are recognized by HTML Help compiler.</para>
+
+<para>Stylesheet creates couple of files which are then used as an
+input for HTML Help Compiler (HHC) which is part of <ulink
+url="http://msdn.microsoft.com/library/tools/htmlhelp/wkshp/download_main.htm">HTML
+Help Workshop</ulink>. If you have HHC in your path, you can start
+conversion to HH format by running command:</para>
+
+<screen format="linespecific">hhc htmlhelp.hhp</screen>
+
+<para>If you can not stand without your mouse, there is alternative
+way. Just double-click on <filename
+moreinfo="none">htmlhelp.hhp</filename> file. HH Workshop will be
+launched automaticaly. Generation of HH file can be started by selecting
+<menuchoice moreinfo="none">
+<guimenu moreinfo="none">File</guimenu> <guimenuitem
+moreinfo="none">Compile</guimenuitem> </menuchoice> from application's
+menu.</para>
+
+</section>
+
+<section>
+<title>Customizing generated files</title>
+
+<section>
+<title>Enabling navigation links</title>
+
+<para>By default, HTML Help stylesheet disables navigation links at
+the start and the bottom of each page. If you want to enable this
+feature, start your XSLT processor with parameter <parameter
+moreinfo="none">suppress.navigation</parameter> set to 0.</para>
+
+<screen format="linespecific">saxon <replaceable>yourfile</replaceable> <replaceable>/path/to/stylesheets/</replaceable>contrib/htmlhelp/htmlhelp.xsl "suppress.navigation=0"</screen>
+
+<para>Another approach is to create driver file, which overrides
+default parameter value.</para>
+
+<programlisting><![CDATA[<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+ <xsl:import href="]]><replaceable>/path/to/stylesheets/</replaceable>contrib/htmlhelp/htmlhelp.xsl<![CDATA["/>
+
+ <xsl:param name="suppress.navigation" select="0"/>
+
+</xsl:stylesheet>
+]]></programlisting>
+
+</section>
+
+<section>
+<title>Generating HTML Help for non-Western European languages</title>
+
+<para>If you are generating HTML Help for non-Western Europe
+languages, you should change output encoding of your files, because
+HTML Help compiler improperly handles UTF-8 and even character
+entities in TOC file and index entries. This can be easily done by
+<quote>driver</quote> file like this:</para>
+
+<programlisting><![CDATA[<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+ <xsl:import href="]]><replaceable>/path/to/stylesheets/</replaceable>contrib/htmlhelp/htmlhelp.xsl<![CDATA["/>
+
+ <xsl:param name="htmlhelp.encoding" select="'windows-1250'"/>
+ <xsl:param name="default.encoding" select="'windows-1250'"/>
+ <xsl:param name="saxon.character.representation" select="'native'"/>
+
+</xsl:stylesheet>
+]]></programlisting>
+
+<para>Default encoding is ISO-8859-1 (aka ISO Latin 1).</para>
+
+</section>
+
+</section>
+
+<section>
+<title>Feedback</title>
+
+<para>If you have any comments and suggestion about HTML Help
+stylesheet feel free to contact me at following address
+<email>jirka@kosek.cz</email>.</para>
+
+</section>
+
+</chapter> \ No newline at end of file
diff --git a/tests/docbook/htmlhelp/htmlhelp-common.xsl b/tests/docbook/htmlhelp/htmlhelp-common.xsl
new file mode 100644
index 00000000..8fc223bb
--- /dev/null
+++ b/tests/docbook/htmlhelp/htmlhelp-common.xsl
@@ -0,0 +1,359 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version="1.0">
+
+<!-- ********************************************************************
+ $Id$
+ ********************************************************************
+
+ This file is used by htmlhelp.xsl if you want to generate source
+ files for HTML Help. It is based on the XSL DocBook Stylesheet
+ distribution (especially on JavaHelp code) from Norman Walsh.
+
+ ******************************************************************** -->
+
+<!-- ==================================================================== -->
+<xsl:param name="htmlhelp.encoding" select="'iso-8859-1'"/>
+
+<doc:param name="htmlhelp.encoding" xmlns="">
+<refpurpose>Character encoding to use in files for HTML Help compiler.</refpurpose>
+<refdescription>
+<para>HTML Help Compiler is not UTF-8 aware, so you should always use
+apropriate single-byte encoding here.</para>
+</refdescription>
+</doc:param>
+
+<xsl:param name="suppress.navigation" select="1"/>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="/">
+ <xsl:apply-templates/>
+ <xsl:call-template name="hhp"/>
+ <xsl:call-template name="hhc"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hhp">
+ <xsl:call-template name="write.text.chunk">
+ <xsl:with-param name="filename" select="'htmlhelp.hhp'"/>
+ <xsl:with-param name="method" select="'text'"/>
+ <xsl:with-param name="content">
+ <xsl:call-template name="hhp-main"/>
+ </xsl:with-param>
+ <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+ </xsl:call-template>
+</xsl:template>
+
+<!-- ==================================================================== -->
+<xsl:template name="hhp-main">
+<xsl:text>[OPTIONS]
+</xsl:text>
+<xsl:if test="//indexterm">
+<xsl:text>Auto Index=Yes
+</xsl:text></xsl:if>
+<xsl:text>Compatibility=1.1 or later
+Compiled file=htmlhelp.chm
+Contents file=toc.hhc
+Default topic=</xsl:text>
+ <xsl:call-template name="make-relative-filename">
+ <xsl:with-param name="base.dir" select="$base.dir"/>
+ <xsl:with-param name="base.name">
+ <xsl:apply-templates mode="chunk-filename" select="/"/>
+ </xsl:with-param>
+ </xsl:call-template>
+<xsl:text>
+Display compile progress=No
+Full-text search=Yes
+Language=</xsl:text>
+<xsl:if test="//@lang">
+ <xsl:variable name="lang" select="//@lang[1]"/>
+ <xsl:value-of select="document('langcodes.xml')//gentext[@lang=string($lang)]"/>
+</xsl:if>
+<xsl:if test="not(//@lang)">
+ <xsl:text>0x0409 English (United States)
+</xsl:text></xsl:if>
+<xsl:text>
+Title=</xsl:text><xsl:value-of select="//title[1]"/>
+<xsl:text>
+
+[FILES]
+</xsl:text>
+<xsl:apply-templates mode="enumerate-files"/>
+</xsl:template>
+<!-- ==================================================================== -->
+
+<xsl:template match="set|book|part|preface|chapter|appendix
+ |article
+ |reference|refentry
+ |sect1[position()>1]
+ |section[position()>1 and name(parent::*) != 'section']
+ |book/glossary|article/glossary
+ |book/bibliography|article/bibliography
+ |colophon"
+ mode="enumerate-files">
+ <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
+ <xsl:if test="$ischunk='1'">
+ <xsl:call-template name="make-relative-filename">
+ <xsl:with-param name="base.dir" select="$base.dir"/>
+ <xsl:with-param name="base.name">
+ <xsl:apply-templates mode="chunk-filename" select="."/>
+ </xsl:with-param>
+ </xsl:call-template>
+ <xsl:text>&#10;</xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="*" mode="enumerate-files"/>
+</xsl:template>
+
+<xsl:template match="text()" mode="enumerate-files">
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<!-- Following templates are not nice. It is because MS help compiler is unable
+ to process correct HTML files. We must generate following weird
+ stuff instead. -->
+
+<xsl:template name="hhc">
+ <xsl:call-template name="write.text.chunk">
+ <xsl:with-param name="filename" select="'toc.hhc'"/>
+ <xsl:with-param name="method" select="'text'"/>
+ <xsl:with-param name="content">
+ <xsl:call-template name="hhc-main"/>
+ </xsl:with-param>
+ <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+ </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="hhc-main">
+ <xsl:text>&lt;HTML&gt;
+&lt;HEAD&gt;
+&lt;/HEAD&gt;
+&lt;BODY&gt;
+&lt;OBJECT type="text/site properties"&gt;
+ &lt;param name="ImageType" value="Folder"&gt;
+&lt;/OBJECT&gt;
+&lt;UL&gt;
+</xsl:text>
+ <xsl:apply-templates select="." mode="hhc"/>
+<xsl:text>&lt;/UL&gt;
+&lt;/BODY&gt;
+&lt;/HTML&gt;</xsl:text>
+</xsl:template>
+
+<xsl:template match="set" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="book">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="book" mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="book" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="part|reference|preface|chapter|appendix|article|colophon">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="part|reference|preface|chapter|appendix|article|colophon"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="part|reference|preface|chapter|appendix|article"
+ mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="reference|preface|chapter|appendix|refentry|section|sect1">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates
+ select="reference|preface|chapter|appendix|refentry|section|sect1"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="section" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="section">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="section" mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect1" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="sect2">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="sect2"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect2" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="sect3">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="sect3"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect3" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="sect4">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="sect4"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect4" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+ <xsl:if test="sect5">
+ <xsl:text>&lt;UL&gt;</xsl:text>
+ <xsl:apply-templates select="sect5"
+ mode="hhc"/>
+ <xsl:text>&lt;/UL&gt;</xsl:text>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect5|refentry|colophon" mode="hhc">
+ <xsl:variable name="title">
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:variable>
+
+ <xsl:text>&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+ &lt;param name="Name" value="</xsl:text>
+ <xsl:value-of select="$title"/>
+ <xsl:text>"&gt;
+ &lt;param name="Local" value="</xsl:text>
+ <xsl:call-template name="href.target.with.base.dir"/>
+ <xsl:text>"&gt;
+ &lt;/OBJECT&gt;</xsl:text>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="indexterm">
+
+ <xsl:variable name="text">
+ <xsl:value-of select="primary"/>
+ <xsl:if test="secondary">
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="secondary"/>
+ </xsl:if>
+ <xsl:if test="tertiary">
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="tertiary"/>
+ </xsl:if>
+ </xsl:variable>
+
+ <OBJECT type="application/x-oleobject"
+ classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+ <param name="Keyword" value="{$text}"/>
+ </OBJECT>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="href.target.with.base.dir">
+ <xsl:value-of select="$base.dir"/>
+ <xsl:call-template name="href.target"/>
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/tests/docbook/htmlhelp/htmlhelp.xsl b/tests/docbook/htmlhelp/htmlhelp.xsl
new file mode 100644
index 00000000..710ee606
--- /dev/null
+++ b/tests/docbook/htmlhelp/htmlhelp.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ version="1.0"
+ exclude-result-prefixes="doc">
+
+<xsl:import href="../html/chunk.xsl"/>
+<xsl:include href="htmlhelp-common.xsl"/>
+
+<xsl:template name="write.text.chunk">
+ <xsl:param name="filename" select="''"/>
+ <xsl:param name="method" select="'text'"/>
+ <xsl:param name="content" select="''"/>
+ <xsl:param name="encoding" select="'iso-8859-1'"/>
+ <xsl:call-template name="write.chunk">
+ <xsl:with-param name="filename" select="$filename"/>
+ <xsl:with-param name="method" select="$method"/>
+ <xsl:with-param name="content" select="$content"/>
+ <xsl:with-param name="encoding" select="$encoding"/>
+ </xsl:call-template>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/htmlhelp/langcodes.xml b/tests/docbook/htmlhelp/langcodes.xml
new file mode 100644
index 00000000..7cac5c08
--- /dev/null
+++ b/tests/docbook/htmlhelp/langcodes.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<localization>
+<gentext lang="sq">0x041c Albanian</gentext>
+<gentext lang="ar">0x1401 Arabic (ALGERIA)</gentext>
+<gentext lang="es">0x2c0a Spanish (ARGENTINA)</gentext>
+<gentext lang="en">0x0c09 English (AUSTRALIA)</gentext>
+<gentext lang="de">0x0c07 German (AUSTRIA)</gentext>
+<gentext lang="ar">0x3c01 Arabic (BAHRAIN)</gentext>
+<gentext lang="be">0x0423 Byelorussian</gentext>
+<gentext lang="fr">0x080c French (BELGIUM)</gentext>
+<gentext lang="en">0x2809 English (BELIZE)</gentext>
+<gentext lang="es">0x400a Spanish (BOLIVIA)</gentext>
+<gentext lang="pt">0x0416 Portuguese (BRAZIL)</gentext>
+<gentext lang="ms">0x083e Malay (BRUNEI DARUSSALAM)</gentext>
+<gentext lang="bg">0x0402 Bulgarian</gentext>
+<gentext lang="fr">0x0c0c French (CANADA)</gentext>
+<gentext lang="es">0x340a Spanish (CHILE)</gentext>
+<gentext lang="zh">0x0804 Chinese (CHINA)</gentext>
+<gentext lang="es">0x240a Spanish (COLOMBIA)</gentext>
+<gentext lang="es">0x140a Spanish (COSTA RICA)</gentext>
+<gentext lang="hr">0x041a Croatian</gentext>
+<gentext lang="cs">0x0405 Czech</gentext>
+<gentext lang="da">0x0406 Danish</gentext>
+<gentext lang="es">0x1c0a Spanish (DOMINICAN REPUBLIC)</gentext>
+<gentext lang="es">0x300a Spanish (ECUADOR)</gentext>
+<gentext lang="ar">0x0c01 Arabic (EGYPT)</gentext>
+<gentext lang="es">0x440a Spanish (EL SALVADOR)</gentext>
+<gentext lang="et">0x0425 Estonian</gentext>
+<gentext lang="fo">0x0438 Faeroese</gentext>
+<gentext lang="fi">0x040b Finnish</gentext>
+<gentext lang="fr">0x040c French (FRANCE)</gentext>
+<gentext lang="de">0x0407 German (GERMANY)</gentext>
+<gentext lang="el">0x0408 Greek</gentext>
+<gentext lang="es">0x100a Spanish (GUATEMALA)</gentext>
+<gentext lang="es">0x480a Spanish (HONDURAS)</gentext>
+<gentext lang="zh">0x0c04 Chinese (HONG KONG)</gentext>
+<gentext lang="hu">0x040e Hungarian</gentext>
+<gentext lang="is">0x040f Icelandic</gentext>
+<gentext lang="hi">0x0439 Hindi</gentext>
+<gentext lang="in">0x04</gentext>
+<gentext lang="fa">0x0429 Farsi</gentext>
+<gentext lang="ar">0x0801 Arabic (IRAQ)</gentext>
+<gentext lang="en">0x1809 English (IRELAND)</gentext>
+<gentext lang="iw">0x04</gentext>
+<gentext lang="it">0x0410 Italian</gentext>
+<gentext lang="en">0x2009 English (JAMAICA)</gentext>
+<gentext lang="ja">0x0411 Japanese</gentext>
+<gentext lang="ar">0x2c01 Arabic (JORDAN)</gentext>
+<gentext lang="sw">0x0441 Swahili</gentext>
+<gentext lang="ko">0x0412 Korean</gentext>
+<gentext lang="ar">0x3401 Arabic (KUWAIT)</gentext>
+<gentext lang="lv">0x0426 Latvian (Lettish)</gentext>
+<gentext lang="ar">0x3001 Arabic (LEBANON)</gentext>
+<gentext lang="ar">0x1001 Arabic (LIBYAN ARAB JAMAHIRIYA)</gentext>
+<gentext lang="de">0x1407 German (LIECHTENSTEIN)</gentext>
+<gentext lang="lt">0x0427 Lithuanian</gentext>
+<gentext lang="de">0x1007 German (LUXEMBOURG)</gentext>
+<gentext lang="zh">0x1404 Chinese (MACAU)</gentext>
+<gentext lang="mk">0x042f Macedonian</gentext>
+<gentext lang="ms">0x043e Malay (MALAYSIA)</gentext>
+<gentext lang="es">0x080a Spanish (MEXICO)</gentext>
+<gentext lang="fr">0x180c French (MONACO)</gentext>
+<gentext lang="ar">0x1801 Arabic (MOROCCO)</gentext>
+<gentext lang="nl">0x0413 Dutch</gentext>
+<gentext lang="en">0x1409 English (NEW ZEALAND)</gentext>
+<gentext lang="es">0x4c0a Spanish (NICARAGUA)</gentext>
+<gentext lang="no">0x0414 Norwegian</gentext>
+<gentext lang="ar">0x2001 Arabic (OMAN)</gentext>
+<gentext lang="ur">0x0420 Urdu</gentext>
+<gentext lang="es">0x180a Spanish (PANAMA)</gentext>
+<gentext lang="es">0x3c0a Spanish (PARAGUAY)</gentext>
+<gentext lang="es">0x280a Spanish (PERU)</gentext>
+<gentext lang="en">0x3409 English (PHILIPPINES)</gentext>
+<gentext lang="pl">0x0415 Polish</gentext>
+<gentext lang="pt">0x0816 Portuguese (PORTUGAL)</gentext>
+<gentext lang="es">0x500a Spanish (PUERTO RICO)</gentext>
+<gentext lang="ar">0x4001 Arabic (QATAR)</gentext>
+<gentext lang="ro">0x0418 Romanian</gentext>
+<gentext lang="ru">0x0419 Russian</gentext>
+<gentext lang="ar">0x0401 Arabic (SAUDI ARABIA)</gentext>
+<gentext lang="zh">0x1004 Chinese (SINGAPORE)</gentext>
+<gentext lang="sk">0x041b Slovak</gentext>
+<gentext lang="sl">0x0424 Slovenian</gentext>
+<gentext lang="af">0x0436 Afrikaans</gentext>
+<gentext lang="ca">0x0403 Catalan</gentext>
+<gentext lang="sv">0x041d Swedish</gentext>
+<gentext lang="de">0x0807 German (SWITZERLAND)</gentext>
+<gentext lang="ar">0x2801 Arabic (SYRIAN ARAB REPUBLIC)</gentext>
+<gentext lang="zh">0x0404 Chinese (TAIWAN, PROVINCE OF CHINA)</gentext>
+<gentext lang="th">0x041e Thai</gentext>
+<gentext lang="en">0x2c09 English (TRINIDAD AND TOBAGO)</gentext>
+<gentext lang="ar">0x1c01 Arabic (TUNISIA)</gentext>
+<gentext lang="tr">0x041f Turkish</gentext>
+<gentext lang="uk">0x0422 Ukrainian</gentext>
+<gentext lang="ar">0x3801 Arabic (UNITED ARAB EMIRATES)</gentext>
+<gentext lang="en">0x0809 English (UNITED KINGDOM)</gentext>
+<gentext lang="en">0x0409 English (UNITED STATES)</gentext>
+<gentext lang="es">0x380a Spanish (URUGUAY)</gentext>
+<gentext lang="es">0x200a Spanish (VENEZUELA)</gentext>
+<gentext lang="vi">0x242a Vietnamese</gentext>
+<gentext lang="ar">0x2401 Arabic (YEMEN)</gentext>
+<gentext lang="en">0x3009 English (ZIMBABWE)</gentext>
+</localization>
diff --git a/tests/docbook/htmlhelp/xthtmlhelp.xsl b/tests/docbook/htmlhelp/xthtmlhelp.xsl
new file mode 100644
index 00000000..2f5e48e3
--- /dev/null
+++ b/tests/docbook/htmlhelp/xthtmlhelp.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xt="http://www.jclark.com/xt"
+ extension-element-prefixes="xt"
+ version="1.0">
+
+<xsl:import href="../html/xtchunk.xsl"/>
+<xsl:include href="htmlhelp-common.xsl"/>
+
+<xsl:template name="write.text.chunk">
+ <xsl:param name="filename" select="''"/>
+ <xsl:param name="method" select="'html'"/>
+ <xsl:param name="content" select="''"/>
+ <xsl:param name="encoding" select="'iso-8859-1'"/>
+
+ <!-- XT bug, if method is an AVT, it doesn't work -->
+ <!-- encoding doesn't work as an AVT either -->
+ <xt:document method="text" href="{$filename}" encoding="iso-8859-1">
+ <xsl:copy-of select="$content"/>
+ </xt:document>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/images/ChangeLog b/tests/docbook/images/ChangeLog
new file mode 100644
index 00000000..a006d097
--- /dev/null
+++ b/tests/docbook/images/ChangeLog
@@ -0,0 +1,5 @@
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * caution.gif, caution.png, caution.tif, home.png, important.gif, important.png, important.tif, next.png, note.gif, note.png, note.tif, prev.png, tip.gif, tip.png, tip.tif, toc-blank.png, toc-minus.png, toc-plus.png, up.png, warning.gif, warning.png, warning.tif:
+ New file.
+
diff --git a/tests/docbook/images/callouts/1.png b/tests/docbook/images/callouts/1.png
new file mode 100644
index 00000000..7d473430
--- /dev/null
+++ b/tests/docbook/images/callouts/1.png
Binary files differ
diff --git a/tests/docbook/images/callouts/10.png b/tests/docbook/images/callouts/10.png
new file mode 100644
index 00000000..997bbc82
--- /dev/null
+++ b/tests/docbook/images/callouts/10.png
Binary files differ
diff --git a/tests/docbook/images/callouts/2.png b/tests/docbook/images/callouts/2.png
new file mode 100644
index 00000000..5d09341b
--- /dev/null
+++ b/tests/docbook/images/callouts/2.png
Binary files differ
diff --git a/tests/docbook/images/callouts/3.png b/tests/docbook/images/callouts/3.png
new file mode 100644
index 00000000..ef7b7004
--- /dev/null
+++ b/tests/docbook/images/callouts/3.png
Binary files differ
diff --git a/tests/docbook/images/callouts/4.png b/tests/docbook/images/callouts/4.png
new file mode 100644
index 00000000..adb8364e
--- /dev/null
+++ b/tests/docbook/images/callouts/4.png
Binary files differ
diff --git a/tests/docbook/images/callouts/5.png b/tests/docbook/images/callouts/5.png
new file mode 100644
index 00000000..4d7eb460
--- /dev/null
+++ b/tests/docbook/images/callouts/5.png
Binary files differ
diff --git a/tests/docbook/images/callouts/6.png b/tests/docbook/images/callouts/6.png
new file mode 100644
index 00000000..0ba694af
--- /dev/null
+++ b/tests/docbook/images/callouts/6.png
Binary files differ
diff --git a/tests/docbook/images/callouts/7.png b/tests/docbook/images/callouts/7.png
new file mode 100644
index 00000000..472e96f8
--- /dev/null
+++ b/tests/docbook/images/callouts/7.png
Binary files differ
diff --git a/tests/docbook/images/callouts/8.png b/tests/docbook/images/callouts/8.png
new file mode 100644
index 00000000..5e60973c
--- /dev/null
+++ b/tests/docbook/images/callouts/8.png
Binary files differ
diff --git a/tests/docbook/images/callouts/9.png b/tests/docbook/images/callouts/9.png
new file mode 100644
index 00000000..a0676d26
--- /dev/null
+++ b/tests/docbook/images/callouts/9.png
Binary files differ
diff --git a/tests/docbook/images/callouts/ChangeLog b/tests/docbook/images/callouts/ChangeLog
new file mode 100644
index 00000000..202c5749
--- /dev/null
+++ b/tests/docbook/images/callouts/ChangeLog
@@ -0,0 +1,5 @@
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * 1.png, 10.png, 2.png, 3.png, 4.png, 5.png, 6.png, 7.png, 8.png, 9.png:
+ New file.
+
diff --git a/tests/docbook/images/caution.gif b/tests/docbook/images/caution.gif
new file mode 100644
index 00000000..d9f5e5b1
--- /dev/null
+++ b/tests/docbook/images/caution.gif
Binary files differ
diff --git a/tests/docbook/images/caution.png b/tests/docbook/images/caution.png
new file mode 100644
index 00000000..5b7809ca
--- /dev/null
+++ b/tests/docbook/images/caution.png
Binary files differ
diff --git a/tests/docbook/images/caution.tif b/tests/docbook/images/caution.tif
new file mode 100644
index 00000000..4a282948
--- /dev/null
+++ b/tests/docbook/images/caution.tif
Binary files differ
diff --git a/tests/docbook/images/home.png b/tests/docbook/images/home.png
new file mode 100644
index 00000000..cbb711de
--- /dev/null
+++ b/tests/docbook/images/home.png
Binary files differ
diff --git a/tests/docbook/images/important.gif b/tests/docbook/images/important.gif
new file mode 100644
index 00000000..6795d9a8
--- /dev/null
+++ b/tests/docbook/images/important.gif
Binary files differ
diff --git a/tests/docbook/images/important.png b/tests/docbook/images/important.png
new file mode 100644
index 00000000..12c90f60
--- /dev/null
+++ b/tests/docbook/images/important.png
Binary files differ
diff --git a/tests/docbook/images/important.tif b/tests/docbook/images/important.tif
new file mode 100644
index 00000000..184de637
--- /dev/null
+++ b/tests/docbook/images/important.tif
Binary files differ
diff --git a/tests/docbook/images/next.png b/tests/docbook/images/next.png
new file mode 100644
index 00000000..45835bf8
--- /dev/null
+++ b/tests/docbook/images/next.png
Binary files differ
diff --git a/tests/docbook/images/note.gif b/tests/docbook/images/note.gif
new file mode 100644
index 00000000..f329d359
--- /dev/null
+++ b/tests/docbook/images/note.gif
Binary files differ
diff --git a/tests/docbook/images/note.png b/tests/docbook/images/note.png
new file mode 100644
index 00000000..d0c3c645
--- /dev/null
+++ b/tests/docbook/images/note.png
Binary files differ
diff --git a/tests/docbook/images/note.tif b/tests/docbook/images/note.tif
new file mode 100644
index 00000000..08644d6b
--- /dev/null
+++ b/tests/docbook/images/note.tif
Binary files differ
diff --git a/tests/docbook/images/prev.png b/tests/docbook/images/prev.png
new file mode 100644
index 00000000..cf24654f
--- /dev/null
+++ b/tests/docbook/images/prev.png
Binary files differ
diff --git a/tests/docbook/images/tip.gif b/tests/docbook/images/tip.gif
new file mode 100644
index 00000000..823f2b41
--- /dev/null
+++ b/tests/docbook/images/tip.gif
Binary files differ
diff --git a/tests/docbook/images/tip.png b/tests/docbook/images/tip.png
new file mode 100644
index 00000000..5c4aab3b
--- /dev/null
+++ b/tests/docbook/images/tip.png
Binary files differ
diff --git a/tests/docbook/images/tip.tif b/tests/docbook/images/tip.tif
new file mode 100644
index 00000000..4a3d8c75
--- /dev/null
+++ b/tests/docbook/images/tip.tif
Binary files differ
diff --git a/tests/docbook/images/toc-blank.png b/tests/docbook/images/toc-blank.png
new file mode 100644
index 00000000..6ffad17a
--- /dev/null
+++ b/tests/docbook/images/toc-blank.png
Binary files differ
diff --git a/tests/docbook/images/toc-minus.png b/tests/docbook/images/toc-minus.png
new file mode 100644
index 00000000..abbb020c
--- /dev/null
+++ b/tests/docbook/images/toc-minus.png
Binary files differ
diff --git a/tests/docbook/images/toc-plus.png b/tests/docbook/images/toc-plus.png
new file mode 100644
index 00000000..941312ce
--- /dev/null
+++ b/tests/docbook/images/toc-plus.png
Binary files differ
diff --git a/tests/docbook/images/up.png b/tests/docbook/images/up.png
new file mode 100644
index 00000000..07634de2
--- /dev/null
+++ b/tests/docbook/images/up.png
Binary files differ
diff --git a/tests/docbook/images/warning.gif b/tests/docbook/images/warning.gif
new file mode 100644
index 00000000..3adf1912
--- /dev/null
+++ b/tests/docbook/images/warning.gif
Binary files differ
diff --git a/tests/docbook/images/warning.png b/tests/docbook/images/warning.png
new file mode 100644
index 00000000..1c33db8f
--- /dev/null
+++ b/tests/docbook/images/warning.png
Binary files differ
diff --git a/tests/docbook/images/warning.tif b/tests/docbook/images/warning.tif
new file mode 100644
index 00000000..7b6611ec
--- /dev/null
+++ b/tests/docbook/images/warning.tif
Binary files differ
diff --git a/tests/docbook/lib/ChangeLog b/tests/docbook/lib/ChangeLog
index 26543d20..e3902503 100644
--- a/tests/docbook/lib/ChangeLog
+++ b/tests/docbook/lib/ChangeLog
@@ -1,20 +1,8 @@
-2001-01-28 Norman Walsh <ndw@nwalsh.com>
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * lib.xsl: Moved string.subst to lib; added length-magnitude and length-units templates for parsing lengths
+ * lib.xsl: Documentation fixes
-2000-10-19 Norman Walsh <ndw@nwalsh.com>
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
- * lib.xsl: Documentation changes
-
-2000-10-17 Norman Walsh <ndw@nwalsh.com>
-
- * lib.xsl: Updated documentation
-
-2000-10-16 Norman Walsh <ndw@nwalsh.com>
-
- * lib.xsl: Added doc:reference
-
-2000-10-09 Norman Walsh <ndw@nwalsh.com>
-
- * LostLog, lib.xsl: New file.
+ * lib.xsl: New file.
diff --git a/tests/docbook/lib/lib.xsl b/tests/docbook/lib/lib.xsl
index 7aa690b4..178fae16 100644
--- a/tests/docbook/lib/lib.xsl
+++ b/tests/docbook/lib/lib.xsl
@@ -95,8 +95,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
<refpurpose>Substitute one text string for another in a string</refpurpose>
<refdescription>
<para>The <function>string.subst</function> template replaces all
-occurances of <param>target</param> in <param>string</param>
-with <param>replacement</param> and returns the result.
+occurances of <parameter>target</parameter> in <parameter>string</parameter>
+with <parameter>replacement</parameter> and returns the result.
</para>
</refdescription>
</doc:template>
@@ -198,7 +198,7 @@ unqualified length ("20" for "20pt") from a dimension.
<refdescription>
<para>The <function>length-spec</function> template returns the
qualified length from a dimension. If an unqualified length is given,
-the <param>default.units</param> will be added to it.
+the <parameter>default.units</parameter> will be added to it.
</para>
</refdescription>
</doc:template>
diff --git a/tests/docbook/result/fo/article.fo b/tests/docbook/result/fo/article.fo
index fa7af132..31fe1e22 100644
--- a/tests/docbook/result/fo/article.fo
+++ b/tests/docbook/result/fo/article.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599706" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2771355" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,11 +89,11 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">nwalshNorman WalshOther CreditEdited bySomeother EditorSomeone Else</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Apr. 26, 1999</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block>
@@ -108,12 +108,12 @@ This article is just a test. This article is just a test.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</fo:block>
<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic">literal layout</fo:inline>
- It'll be a &lt;pre&gt; until the <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">chunk.pl</fo:inline>
+ It'll be a &lt;pre&gt; until the <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">chunk.pl</fo:inline>
script fixes things up.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -121,27 +121,25 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 1. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig">Figure 1.</fo:basic-link>.
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig">Figure 1. Test Figure</fo:basic-link>.
</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig2"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 2. Test Figure2</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A Second
+ <fo:block id="testfig2" 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">Test Figure2</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A Second
Test Figure
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an <fo:basic-link internal-destination="testfig2">link</fo:basic-link> to a
figure.
</fo:block>
- <fo:list-block id="id2740833" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2740839" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2757963" 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="id2757969" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -149,7 +147,7 @@ figure.
<fo:block>Test item.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740849" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2757980" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -157,7 +155,7 @@ figure.
<fo:block>Test item.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740860" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2757990" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -166,8 +164,8 @@ figure.
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:list-block id="id2740872" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2740878" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2758002" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758008" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -175,7 +173,7 @@ figure.
<fo:block>Test item.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740888" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2758019" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -183,7 +181,7 @@ figure.
<fo:block>Test item.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740899" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2758029" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -198,59 +196,59 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</fo:block>
- <fo:block id="id2740924">
+ <fo:block id="id2758054">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740936">
+ <fo:block id="id2758066">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740947">
+ <fo:block id="id2758078">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740959">
+ <fo:block id="id2758089">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fourth level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fourth level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740970">
+ <fo:block id="id2758101">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fifth level section (SI)</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fifth level section (SI)</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741001">
+ <fo:block id="id2758131">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Sixth level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Sixth level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741012">
+ <fo:block id="id2758143">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Seventh level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Seventh level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -267,8 +265,8 @@ This article is just a test. This article is just a test.
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741049">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix A. Appendix</fo:block>
+ <fo:block id="id2758179">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
</fo:block>
</fo:flow>
diff --git a/tests/docbook/result/fo/article2.fo b/tests/docbook/result/fo/article2.fo
index 51df1c36..7b3398d6 100644
--- a/tests/docbook/result/fo/article2.fo
+++ b/tests/docbook/result/fo/article2.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599688" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,18 +89,18 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Norman Walsh</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Apr. 26, 1999</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This article is just a test. This <fo:inline font-style="italic">article</fo:inline>
is just a test.
-This <fo:inline font-weight="bold" font-family="monospace">article</fo:inline> is just a test.
-This <fo:inline font-family="monospace">&lt;ndw@nwalsh.com&gt;</fo:inline> is just a test.
+This <fo:inline font-weight="bold" font-family="Courier">article</fo:inline> is just a test.
+This <fo:inline font-family="Courier">&lt;ndw@nwalsh.com&gt;</fo:inline> is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -110,20 +110,20 @@ This article is just a test. This article is just a test.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This article is just a test. This <fo:inline font-style="italic">article</fo:inline>
is just a test.
-This <fo:inline font-weight="bold" font-family="monospace">article</fo:inline> is just a test.
-This <fo:inline font-family="monospace">&lt;ndw@nwalsh.com&gt;</fo:inline> is just a test.
+This <fo:inline font-weight="bold" font-family="Courier">article</fo:inline> is just a test.
+This <fo:inline font-family="Courier">&lt;ndw@nwalsh.com&gt;</fo:inline> is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</fo:block>
- <fo:table-and-caption id="id2741760" keep-together.within-column="always">
+ <fo:table-and-caption id="id2758816" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1. This is a test table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">This is a test table</fo:block>
</fo:table-caption>
<fo:table table-layout="fixed">
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(2)"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="proportional-column-width(2)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -225,8 +225,8 @@ This article is just a test. This article is just a test.
</fo:table-body>
</fo:table>
</fo:table-and-caption>
- <fo:list-block id="id2740645" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2740652" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2757772" 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="id2757778" 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>term</fo:inline>
@@ -236,7 +236,7 @@ This article is just a test. This article is just a test.
<fo:block>some text</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740680" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2757807" 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>term2a, </fo:inline>
@@ -247,7 +247,7 @@ This article is just a test. This article is just a test.
<fo:block>some text</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2740714" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2757840" 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>term3</fo:inline>
diff --git a/tests/docbook/result/fo/article3.fo b/tests/docbook/result/fo/article3.fo
index f132ab98..2a724904 100644
--- a/tests/docbook/result/fo/article3.fo
+++ b/tests/docbook/result/fo/article3.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599688" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,8 +89,8 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Test Document Title</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This article is just a test. This article is just a test.
@@ -99,43 +99,43 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</fo:block>
- <fo:block id="id2754246">
+ <fo:block id="id2771346">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2754260">
+ <fo:block id="id2771366">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2754272">
+ <fo:block id="id2771376">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2754378">
+ <fo:block id="id2771479">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fourth level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fourth level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2754388">
+ <fo:block id="id2771491">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fifth level section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Fifth level section</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -145,46 +145,46 @@ This article is just a test. This article is just a test.
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741738">
+ <fo:block id="id2758794">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741750">
+ <fo:block id="id2758805">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 2</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 2</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741773">
+ <fo:block id="id2758828">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741785">
+ <fo:block id="id2758840">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741796">
+ <fo:block id="id2758851">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 3</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 3</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -192,35 +192,35 @@ This article is just a test. This article is just a test.
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741821">
+ <fo:block id="id2758876">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740391">
+ <fo:block id="id2757523">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740402">
+ <fo:block id="id2757535">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2740414">
+ <fo:block id="id2757546">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 4</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleSect @ level 4</fo:block>
</fo:block>
</fo:block>
</fo:block>
diff --git a/tests/docbook/result/fo/bib.fo b/tests/docbook/result/fo/bib.fo
index 4881a2a6..d1e39eea 100644
--- a/tests/docbook/result/fo/bib.fo
+++ b/tests/docbook/result/fo/bib.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Test Book</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Test Book</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,11 +97,14 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>A Test Bibliography<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="bib1"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> A Test Bibliography</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="bib1"><fo:page-number-citation ref-id="bib1"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -114,16 +117,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>A Test Bibliography</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Test Bibliography</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Books</fo:block>
- <fo:block id="id2746068">
+ <fo:block id="id2762669" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[AhoSethiUllman96] </fo:inline>
- <fo:inline>Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
+ <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
<fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
<fo:inline>
<fo:inline>Addison-Wesley Publishing Company. </fo:inline>
@@ -142,7 +145,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Periodicals</fo:block>
- <fo:block id="walsh97">
+ <fo:block id="walsh97" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Walsh97] </fo:inline>
<fo:inline>&quot;A Guide to XML&quot;. <fo:inline>Norman Walsh. </fo:inline><fo:inline>1997. </fo:inline><fo:inline>Copyright &#xA9; 1997 ArborText, Inc.. </fo:inline><fo:inline>97-108. </fo:inline></fo:inline>
<fo:inline><fo:inline font-style="italic">XML: Principles, Tools, and Techniques</fo:inline>. <fo:inline><fo:inline>O'Reilly &amp; Associates, Inc.. </fo:inline></fo:inline><fo:inline>1085-2301. </fo:inline><fo:inline>Dan Connolly. </fo:inline></fo:inline>
@@ -155,7 +158,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
<fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
<fo:inline>The World Wide Web Consortium</fo:inline>.
<fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
- <fo:block id="id2744433">
+ <fo:block id="id2760816" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Abbrev] </fo:inline>
<fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
<fo:inline>Subtitle. </fo:inline>
@@ -168,7 +171,7 @@ Abstract, abstract, abstract. Abstract, abstract, abstract. </fo:block>. </fo:in
<fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>
- <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>
<fo:inline>ArtPageNums. </fo:inline>
@@ -179,12 +182,12 @@ AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. </fo:block>. </fo:inline>
<fo:inline>AuthorInitials. </fo:inline>
- <fo:inline><fo:block color="red">&lt;collabname&gt;The names of some collaborators&lt;/collabname&gt;</fo:block><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>The names of some collaborators. </fo:inline><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>. </fo:inline>
- <fo:inline><fo:block color="red">&lt;confdates&gt;confdates&lt;/confdates&gt;</fo:block><fo:block color="red">&lt;conftitle&gt;conftitle&lt;/conftitle&gt;</fo:block><fo:block color="red">&lt;confnum&gt;confnum&lt;/confnum&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>confdates. </fo:inline><fo:inline>conftitle. </fo:inline><fo:inline>confnum. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
-USA. </fo:inline><fo:block color="red">&lt;confsponsor&gt;confsponsor&lt;/confsponsor&gt;</fo:block>. </fo:inline>
+USA. </fo:inline><fo:inline>confsponsor. </fo:inline>. </fo:inline>
<fo:inline>ContractNum. </fo:inline>
<fo:inline>ContractSponsor. </fo:inline>
<fo:inline>Contrib. </fo:inline>
diff --git a/tests/docbook/result/fo/book.fo b/tests/docbook/result/fo/book.fo
index c85d1e54..05c31c78 100644
--- a/tests/docbook/result/fo/book.fo
+++ b/tests/docbook/result/fo/book.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2787333" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2804440" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -94,7 +94,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh and John Doe</fo:block>
@@ -102,7 +102,7 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt" space-before="1em">
<fo:block>Published 16 December 2000</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 2000 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 2000 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Some abstract. Some abstract. Some abstract. Some abstract.
@@ -132,26 +132,62 @@ Some legal notice. Some legal notice. Some legal notice.
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787475"/></fo:block>
- <fo:block>Preface<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2746014"/></fo:block>
- <fo:block>I.Part One Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744418"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804539"><fo:page-number-citation ref-id="id2804539"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> </fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760790"><fo:page-number-citation ref-id="id2760790"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">I Part One Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760806"><fo:page-number-citation ref-id="id2760806"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>1.Section Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>First Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741947"/></fo:block>
- <fo:block>Second Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742006"/></fo:block>
- <fo:block>Third Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742028"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 Section Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
</fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758968"><fo:page-number-citation ref-id="id2758968"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759026"><fo:page-number-citation ref-id="id2759026"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759047"><fo:page-number-citation ref-id="id2759047"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 First Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759110"><fo:page-number-citation ref-id="id2759110"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 Second Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759187"><fo:page-number-citation ref-id="id2759187"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4 Third Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759407"><fo:page-number-citation ref-id="id2759407"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759429"><fo:page-number-citation ref-id="id2759429"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">B Second Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759488"><fo:page-number-citation ref-id="id2759488"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>2.First Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742091"/></fo:block>
- <fo:block>3.Second Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742169"/></fo:block>
- <fo:block>4.Third Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742388"/></fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742410"/></fo:block>
- <fo:block>B.Second Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742469"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -161,14 +197,26 @@ Some legal notice. Some legal notice. Some legal notice.
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Figures</fo:block>
</fo:block>
- <fo:block>1.1.Test Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="testfig1"/></fo:block>
- <fo:block>1.2.Test Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="testfig2"/></fo:block>
- <fo:block>2.2.Test Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="testfig3"/></fo:block>
- <fo:block>A.0.Test Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="testfig4"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1.1 Test Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="testfig1"><fo:page-number-citation ref-id="testfig1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1.2 Test Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="testfig2"><fo:page-number-citation ref-id="testfig2"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2.2 Test Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="testfig3"><fo:page-number-citation ref-id="testfig3"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A.0 Test Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="testfig4"><fo:page-number-citation ref-id="testfig4"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787453" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2804560" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -177,7 +225,7 @@ Some legal notice. Some legal notice. Some legal notice.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>First Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">First Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test. &#x201C;What about&#x2014;this?&#x201D;</fo:block>
@@ -363,7 +411,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787471" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2755984" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -372,13 +420,13 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test dedication.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787475" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2804539" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -387,13 +435,13 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2746014" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2760790" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -402,13 +450,13 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Preface</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false"></fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test preface.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2744418" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2760806" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -417,18 +465,18 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>I. Part One Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Part One Title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Partintro content<fo:footnote><fo:inline>[1]</fo:inline><fo:footnote-body font-size="8pt"><fo:block>[1] This is a footnote in a partintro.</fo:block></fo:footnote-body></fo:footnote>.</fo:block>
- <fo:block id="id2744502">
+ <fo:block id="id2760890">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -439,7 +487,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Section Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -450,59 +498,57 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Section Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741947">
+ <fo:block id="id2758968">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig1"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 1.1. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig1" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2742006">
+ <fo:block id="id2759026">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2742028">
+ <fo:block id="id2759047">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig2"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 1.2. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig2" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742091" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759110" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. First Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. First Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -513,24 +559,23 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. First Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. First Chapter</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-before="0.5em" margin-left="-4pc" font-style="italic" font-size="14.4pt" font-weight="bold" font-family="Helvetica">Chapter Subtitle</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig3"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 2.2. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig3" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742169" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759187" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. Second Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Second Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -541,30 +586,30 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 3. Second Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 3. Second Chapter</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.
-<fo:wrapper id="id2742187"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2742202"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2759205"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2759221"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2742218"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2742242"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2759237"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2759260"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2742257"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2759276"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2742289"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2742304"><!--cp2see--></fo:wrapper>
+<fo:wrapper id="id2759307"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2759323"><!--cp2see--></fo:wrapper>
-<fo:wrapper id="id2742325"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2742348"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2742372"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2759344"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2759367"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2759391"><!--dp2--></fo:wrapper></fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742388" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759407" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">4. Third Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 4. Third Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -575,16 +620,16 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 4. Third Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 4. Third Chapter</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742410" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759429" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -595,23 +640,22 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig4"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure A.0. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig4" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742469" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759488" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">B. Second Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. Second Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -622,22 +666,22 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix B. Second Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix B. Second Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.
-<fo:wrapper id="id2742487"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2742503"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2759506"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2759522"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2742519"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2741990"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2759537"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2759561"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2742128"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2740617"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2761036"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2757669"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2740632"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2740656"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2740679"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2757685"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2757708"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2757732"><!--dp2--></fo:wrapper></fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
diff --git a/tests/docbook/result/fo/book2.fo b/tests/docbook/result/fo/book2.fo
index 28f9ddc7..2a327335 100644
--- a/tests/docbook/result/fo/book2.fo
+++ b/tests/docbook/result/fo/book2.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" keep-with-next="always" space-before="2in">Some Corporation</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">Norman Walsh</fo:block>
@@ -99,10 +99,10 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt">
<fo:block>
- <fo:block font-weight="bold" font-size="12pt">Legal Notice</fo:block>
+ <fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Legal Notice</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test document. You can do what you will with it.</fo:block>
</fo:block>
</fo:block>
@@ -125,123 +125,258 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Preface Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2850875"/></fo:block>
- <fo:block>I.Part One Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787421"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Preface Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2867983"><fo:page-number-citation ref-id="id2867983"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">I Part One Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804527"><fo:page-number-citation ref-id="id2804527"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>1.XRef Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
- <fo:block>2.Section Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="stchap"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest1"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2740946"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2740977"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741232"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741263"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 XRef Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Section Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="stchap"><fo:page-number-citation ref-id="stchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest1"><fo:page-number-citation ref-id="secttest1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758004"><fo:page-number-citation ref-id="id2758004"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758034"><fo:page-number-citation ref-id="id2758034"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758290"><fo:page-number-citation ref-id="id2758290"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="12pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758321"><fo:page-number-citation ref-id="id2758321"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest2"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741471"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741526"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741580"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741635"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest2"><fo:page-number-citation ref-id="secttest2"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758520"><fo:page-number-citation ref-id="id2758520"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758574"><fo:page-number-citation ref-id="id2758574"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758629"><fo:page-number-citation ref-id="id2758629"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="12pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758683"><fo:page-number-citation ref-id="id2758683"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest3"/></fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest4"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest3"><fo:page-number-citation ref-id="secttest3"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest4"><fo:page-number-citation ref-id="secttest4"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 Inline Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758746"><fo:page-number-citation ref-id="id2758746"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4 Block Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2869370"><fo:page-number-citation ref-id="id2869370"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">5 List Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2870946"><fo:page-number-citation ref-id="id2870946"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>3.Inline Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741702"/></fo:block>
- <fo:block>4.Block Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2852264"/></fo:block>
- <fo:block>5.List Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2853841"/></fo:block>
- <fo:block>6.Table Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2857419"/></fo:block>
- <fo:block>7.Index Term Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2863080"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>Index Term Sect 1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2863152"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>Index Term Sect 2<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2863454"/></fo:block>
- <fo:block>Index Term Sect 3<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2863597"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">6 Table Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2874524"><fo:page-number-citation ref-id="id2874524"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">7 Index Term Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880186"><fo:page-number-citation ref-id="id2880186"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880257"><fo:page-number-citation ref-id="id2880257"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 2</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880559"><fo:page-number-citation ref-id="id2880559"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 3</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880702"><fo:page-number-citation ref-id="id2880702"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>II.Part Two Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="part"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">II Part Two Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="part"><fo:page-number-citation ref-id="part"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>8.CmdSynopsis Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2863649"/></fo:block>
- <fo:block>9.FuncSynopsis Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2864406"/></fo:block>
- <fo:block>10.Callout Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2864702"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">8 CmdSynopsis Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880754"><fo:page-number-citation ref-id="id2880754"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">9 FuncSynopsis Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2881511"><fo:page-number-citation ref-id="id2881511"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">10 Callout Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2881808"><fo:page-number-citation ref-id="id2881808"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">III A Reference Part</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2882371"><fo:page-number-citation ref-id="id2882371"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>III.A Reference Part<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2865265"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>I.Reference<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="reference"/></fo:block>
- <fo:block start-indent="2pc">RefEntryTitleRefDescriptorRefName1RefName2Yes, there must be a purpose! A
- Synopsis
- Goes
- HereA RefSect1Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.A RefSect2Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.A RefSect3Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.This is a footnote in a refentry.
-Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing whitespaceDescription Returns the argument string without trailing whitespace.
- <fo:block>2.chop() example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2865542"/></fo:block>
- </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">I Reference</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="reference"><fo:page-number-citation ref-id="reference"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> RefEntryTitle</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2882408"><fo:page-number-citation ref-id="id2882408"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">Chop</fo:inline></fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2882593"><fo:page-number-citation ref-id="id2882593"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A A Very Short Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="appendix"><fo:page-number-citation ref-id="appendix"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">B A Very Long Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2882713"><fo:page-number-citation ref-id="id2882713"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A.A Very Short Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="appendix"/></fo:block>
- <fo:block>B.A Very Long Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2865608"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>a sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866258"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866288"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866319"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866358"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866389"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883363"><fo:page-number-citation ref-id="id2883363"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883394"><fo:page-number-citation ref-id="id2883394"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883424"><fo:page-number-citation ref-id="id2883424"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883464"><fo:page-number-citation ref-id="id2883464"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883494"><fo:page-number-citation ref-id="id2883494"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866428"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866483"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866537"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866592"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866646"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883533"><fo:page-number-citation ref-id="id2883533"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883588"><fo:page-number-citation ref-id="id2883588"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883642"><fo:page-number-citation ref-id="id2883642"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883697"><fo:page-number-citation ref-id="id2883697"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883751"><fo:page-number-citation ref-id="id2883751"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866718"/></fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2866750"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883823"><fo:page-number-citation ref-id="id2883823"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883855"><fo:page-number-citation ref-id="id2883855"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> A Test Bibliography</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="bib1"><fo:page-number-citation ref-id="bib1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Example Glossary</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="gloss"><fo:page-number-citation ref-id="gloss"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="index"><fo:page-number-citation ref-id="index"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> An Index with a Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2885907"><fo:page-number-citation ref-id="id2885907"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A Test Bibliography<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="bib1"/></fo:block>
- <fo:block>Example Glossary<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="gloss"/></fo:block>
- <fo:block>Index<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="index"/></fo:block>
- <fo:block>An Index with a Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2868802"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -251,7 +386,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Figures</fo:block>
</fo:block>
- <fo:block>4.0.A Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="figure"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 A Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="figure"><fo:page-number-citation ref-id="figure"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -261,7 +399,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Tables</fo:block>
</fo:block>
- <fo:block>4.0.A Table<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="table"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 A Table</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="table"><fo:page-number-citation ref-id="table"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -271,8 +412,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Examples</fo:block>
</fo:block>
- <fo:block>4.0.An Example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="example"/></fo:block>
- <fo:block>2.chop() example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2865542"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 An Example</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="example"><fo:page-number-citation ref-id="example"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 chop() example</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2882647"><fo:page-number-citation ref-id="id2882647"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -282,11 +429,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Equations</fo:block>
</fo:block>
- <fo:block>4.0.An Equation<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="equation"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 An Equation</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="equation"><fo:page-number-citation ref-id="equation"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2850817" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2762723" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -295,7 +445,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This test book is dedicated to all the testers. This is the first para
@@ -304,7 +454,7 @@ of the dedication.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the dedication.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2850875" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2867983" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -313,7 +463,7 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Preface Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Preface Title</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Preface content.</fo:block>
@@ -321,7 +471,7 @@ of the dedication.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the preface.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787421" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2804527" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -330,18 +480,18 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>I. Part One Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Part One Title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Partintro content<fo:footnote><fo:inline>[1]</fo:inline><fo:footnote-body font-size="8pt"><fo:block>[1] This is a footnote in a partintro.</fo:block></fo:footnote-body></fo:footnote>.</fo:block>
- <fo:block id="id2787364">
+ <fo:block id="id2804469">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -352,7 +502,7 @@ of the dedication.</fo:block>
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. XRef Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -363,95 +513,93 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. XRef Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Xrefs</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Xrefs</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="book">
- <fo:inline font-style="italic">Book Title</fo:inline>
- </fo:basic-link>
+ <fo:basic-link internal-destination="book">Book Title</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="part">Part II.</fo:basic-link>
+ <fo:basic-link internal-destination="part">Part II. Part Two Title</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="chapter">Chapter 1., <fo:inline font-style="italic">XRef Tests</fo:inline></fo:basic-link>
+ <fo:basic-link internal-destination="chapter">Chapter 1. XRef Tests</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="appendix">Appendix A.</fo:basic-link>
+ <fo:basic-link internal-destination="appendix">Appendix A. A Very Short Appendix</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="table">Table 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="table">Table 4.0. A Table</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="figure">Figure 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="figure">Figure 4.0. A Figure</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="example">Example 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="example">Example 4.0. An Example</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="equation">Equation 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="equation"></fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="reference">Reference I.</fo:basic-link>
+ <fo:basic-link internal-destination="reference">Reference</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="bib1">&#x201C;A Test Bibliography&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="bib1">A Test Bibliography</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="gloss">&#x201C;Example Glossary&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="gloss">Example Glossary</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="index">&#x201C;Index&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="index">Index</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -459,10 +607,10 @@ of the dedication.</fo:block>
</fo:table>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first reference to <fo:inline font-style="italic">XML</fo:inline>.
This is the second reference to XML.
-These are references without linkend
+These are references without <fo:inline font-family="Courier">linkend</fo:inline>
attributes: <fo:inline font-style="italic">XML</fo:inline>, XML.</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Links</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">More <fo:basic-link external-destination="http://www.jclark.com/dsssl/">DSSSL information</fo:basic-link> [http://www.jclark.com/dsssl/]
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Links</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">More <fo:basic-link external-destination="http://www.jclark.com/dsssl/">DSSSL information</fo:basic-link><fo:inline hyphenate="false"> [http://www.jclark.com/dsssl/]</fo:inline>
is available.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">There is <fo:basic-link internal-destination="part">a second part</fo:basic-link> in this book.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the <fo:basic-link internal-destination="chapter"/>
@@ -472,7 +620,7 @@ chapter.</fo:block>
<fo:page-sequence id="stchap" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Section Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Section Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -483,7 +631,7 @@ chapter.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. Section Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. Section Tests</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-before="0.5em" margin-left="-4pc" font-style="italic" font-size="14.4pt" font-weight="bold" font-family="Helvetica">Section Tests Subtitle</fo:block>
</fo:block>
@@ -493,18 +641,18 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2742161"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2742176"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2759170"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2759186"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2742192"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2742216"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2759202"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2759225"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2742231"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2742263"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2759241"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2759272"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2742278"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2742302"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2742326"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2759288"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2759312"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2759335"><!--dp2--></fo:wrapper></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -526,8 +674,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest1">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -537,20 +685,20 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2742433"><!--ep1, ep1es1, ep1es1et1--></fo:wrapper>
-<fo:wrapper id="id2742464"><!--ep1, ep1es2--></fo:wrapper>
-<fo:wrapper id="id2742488"><!--ep2--></fo:wrapper>
+<fo:wrapper id="id2759440"><!--ep1, ep1es1, ep1es1et1--></fo:wrapper>
+<fo:wrapper id="id2759472"><!--ep1, ep1es2--></fo:wrapper>
+<fo:wrapper id="id2759495"><!--ep2--></fo:wrapper>
-<fo:wrapper id="id2742504"><!--fp1, fp1fs1--></fo:wrapper>
-<fo:wrapper id="id2742527"><!--fp1, fp1fs2, fp1fs2ft1--></fo:wrapper>
-<fo:wrapper id="id2741918"><!--fp2--></fo:wrapper>
+<fo:wrapper id="id2759511"><!--fp1, fp1fs1--></fo:wrapper>
+<fo:wrapper id="id2759534"><!--fp1, fp1fs2, fp1fs2ft1--></fo:wrapper>
+<fo:wrapper id="id2759077"><!--fp2--></fo:wrapper>
-<fo:wrapper id="id2742003"><!--gp1, gp1gs1--></fo:wrapper>
-<fo:wrapper id="id2740772"><!--gp1, gp1gs2--></fo:wrapper>
-<fo:wrapper id="id2740796"><!--gp1, gp1gs2, gp1gs2gt1--></fo:wrapper>
-<fo:wrapper id="id2740827"><!--gp1, gp1gs2, gp1gs2gt2--></fo:wrapper>
-<fo:wrapper id="id2740858"><!--gp1, gp1gs3--></fo:wrapper>
-<fo:wrapper id="id2740882"><!--gp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2759012"><!--gp1, gp1gs1--></fo:wrapper>
+<fo:wrapper id="id2757830"><!--gp1, gp1gs2--></fo:wrapper>
+<fo:wrapper id="id2757853"><!--gp1, gp1gs2, gp1gs2gt1--></fo:wrapper>
+<fo:wrapper id="id2757885"><!--gp1, gp1gs2, gp1gs2gt2--></fo:wrapper>
+<fo:wrapper id="id2757916"><!--gp1, gp1gs3--></fo:wrapper>
+<fo:wrapper id="id2757940"><!--gp2--></fo:wrapper></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -569,11 +717,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2740946">
+ <fo:block id="id2758004">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -583,11 +731,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2740977">
+ <fo:block id="id2758034">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -597,21 +745,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2741006"><!--hp1, hp1hs1, hp1hs1ht1--></fo:wrapper>
-<fo:wrapper id="id2741037"><!--hp1, hp1hs1, hp1hs1ht2--></fo:wrapper>
-<fo:wrapper id="id2741068"><!--hp2--></fo:wrapper>
+<fo:wrapper id="id2758063"><!--hp1, hp1hs1, hp1hs1ht1--></fo:wrapper>
+<fo:wrapper id="id2758095"><!--hp1, hp1hs1, hp1hs1ht2--></fo:wrapper>
+<fo:wrapper id="id2758126"><!--hp2--></fo:wrapper>
-<fo:wrapper id="id2741084"><!--ip1--></fo:wrapper>
-<fo:wrapper id="id2741100"><!--ip1, ip1is1--></fo:wrapper>
-<fo:wrapper id="id2741123"><!--ip1, ip1is1, ip1is1it1--></fo:wrapper>
-<fo:wrapper id="id2741155"><!--ip1, ip1is1, ip1is1it2--></fo:wrapper>
-<fo:wrapper id="id2741186"><!--ip1, ip1is2, ip1is2it1--></fo:wrapper>
-<fo:wrapper id="id2741218"><!--ip2--></fo:wrapper></fo:block>
- <fo:block id="id2741232">
+<fo:wrapper id="id2758142"><!--ip1--></fo:wrapper>
+<fo:wrapper id="id2758158"><!--ip1, ip1is1--></fo:wrapper>
+<fo:wrapper id="id2758181"><!--ip1, ip1is1, ip1is1it1--></fo:wrapper>
+<fo:wrapper id="id2758212"><!--ip1, ip1is1, ip1is1it2--></fo:wrapper>
+<fo:wrapper id="id2758244"><!--ip1, ip1is2, ip1is2it1--></fo:wrapper>
+<fo:wrapper id="id2758275"><!--ip2--></fo:wrapper></fo:block>
+ <fo:block id="id2758290">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -621,11 +769,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741263">
+ <fo:block id="id2758321">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -643,8 +791,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest2">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect1 subtitle</fo:block>
@@ -655,15 +803,15 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2741378"><!--jp1--></fo:wrapper>
-<fo:wrapper id="id2741394"><!--jp1, jp1js1, jp1js1jt1--></fo:wrapper>
-<fo:wrapper id="id2741425"><!--jp1, jp1js1, jp1js1jt2--></fo:wrapper>
-<fo:wrapper id="id2741456"><!--jp2--></fo:wrapper></fo:block>
- <fo:block id="id2741471">
+<fo:wrapper id="id2758359"><!--jp1--></fo:wrapper>
+<fo:wrapper id="id2758442"><!--jp1, jp1js1, jp1js1jt1--></fo:wrapper>
+<fo:wrapper id="id2758474"><!--jp1, jp1js1, jp1js1jt2--></fo:wrapper>
+<fo:wrapper id="id2758505"><!--jp2--></fo:wrapper></fo:block>
+ <fo:block id="id2758520">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect2 subtitle</fo:block>
@@ -674,11 +822,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741526">
+ <fo:block id="id2758574">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect3 subtitle</fo:block>
@@ -689,11 +837,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741580">
+ <fo:block id="id2758629">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect4 subtitle</fo:block>
@@ -704,11 +852,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741635">
+ <fo:block id="id2758683">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect5 subtitle</fo:block>
@@ -727,8 +875,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest3">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -742,8 +890,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest4">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -756,10 +904,10 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2741702" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2758746" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. Inline Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Inline Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -770,14 +918,14 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 3. Inline Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 3. Inline Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2851195">
+ <fo:block id="id2758833">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Testing `Quotes' in a title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Testing &#x2018;Quotes&#x2019; in a title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -794,7 +942,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUIIcon</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block>SGMLTag (Attribute)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (Attribute)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -805,7 +953,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUILabel</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">SGMLTag</fo:inline> (AttValue)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (AttValue)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -816,7 +964,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUIMenu</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">SGMLTag</fo:inline> (Element)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (Element)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -827,7 +975,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUISubMenu</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;/SGMLTag&gt;</fo:inline> (EndTag)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;/SGMLTag&gt;</fo:inline> (EndTag)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -838,7 +986,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>Hardware</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&amp;SGMLTag;</fo:inline> (GenEntity)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&amp;SGMLTag;</fo:inline> (GenEntity)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -848,12 +996,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-cell>
<fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&amp;#SGMLTag;</fo:inline> (NumCharRef)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&amp;#SGMLTag;</fo:inline> (NumCharRef)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -866,20 +1014,20 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>Interface</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">%SGMLTag;</fo:inline> (ParamEntity)</fo:block>
+ <fo:block><fo:inline font-family="Courier">%SGMLTag;</fo:inline> (ParamEntity)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">ClassName</fo:inline>
+ <fo:inline font-family="Courier">ClassName</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>InterfaceDefinition</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;?SGMLTag&gt;</fo:inline> (PI)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;?SGMLTag&gt;</fo:inline> (PI)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -894,7 +1042,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;!--SGMLTag--&gt;</fo:inline> (SGMLComment)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;!--SGMLTag--&gt;</fo:inline> (SGMLComment)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -905,13 +1053,13 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>KeyCode</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;SGMLTag&gt;</fo:inline> (StartTag)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;SGMLTag&gt;</fo:inline> (StartTag)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">ComputerOutput</fo:inline>
+ <fo:inline font-family="Courier">ComputerOutput</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -919,7 +1067,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">SGMLTag</fo:inline>
+ <fo:inline font-family="Courier">SGMLTag</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -932,7 +1080,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">StructField</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">StructField</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -942,7 +1090,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Literal</fo:inline>
+ <fo:inline font-family="Courier">Literal</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -965,7 +1113,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">&lt;Email&gt;</fo:inline>
+ <fo:inline font-family="Courier">&lt;Email&gt;</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -995,12 +1143,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">EnVar</fo:inline>
+ <fo:inline font-family="Courier">EnVar</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Option</fo:inline>
+ <fo:inline font-family="Courier">Option</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1021,12 +1169,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Filename</fo:inline>
+ <fo:inline font-family="Courier">Filename</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">Parameter</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">Parameter</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1054,19 +1202,19 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Prompt</fo:inline>
+ <fo:inline font-family="Courier">Prompt</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-weight="bold" font-family="monospace">UserInput</fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier">UserInput</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Function</fo:inline>
+ <fo:inline font-family="Courier">Function</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1095,7 +1243,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">Replaceable</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">Replaceable</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1117,15 +1265,15 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">And here are a couple of index terms, as another test (of
index terms, not inlines).
-<fo:wrapper id="id2852215"><!--aap1--></fo:wrapper>
-<fo:wrapper id="id2852238"><!--bbp1--></fo:wrapper></fo:block>
+<fo:wrapper id="id2869321"><!--aap1--></fo:wrapper>
+<fo:wrapper id="id2869344"><!--bbp1--></fo:wrapper></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2852264" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2869370" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">4. Block Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 4. Block Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1136,45 +1284,42 @@ index terms, not inlines).
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 4. Block Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 4. Block Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2852278">
+ <fo:block id="id2869384">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Formal Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Formal Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Example</fo:block>
- <fo:block keep-with-next.within-column="always" id="example"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Example 4.0. An Example</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Example</fo:block>
+ <fo:block id="example" 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">An Example</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is an example of a trivial example.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Figure</fo:block>
- <fo:block keep-with-next.within-column="always" id="figure"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 4.0. A Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is an example of a trivial figure.</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Figure</fo:block>
+ <fo:block id="figure" 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">A Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is an example of a trivial figure.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Equation</fo:block>
- <fo:block keep-with-next.within-column="always" id="equation"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Equation 4.0. An Equation</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Equation</fo:block>
+ <fo:block id="equation" 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">An Equation</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Table</fo:block>
- <fo:table-and-caption id="table" keep-together.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Table</fo:block>
+ <fo:table-and-caption id="table" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 4.0. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1" column-width="0.5in"/>
- <fo:table-column column-number="2" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="0.5in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -1204,28 +1349,28 @@ index terms, not inlines).
</fo:table>
</fo:table-and-caption>
</fo:block>
- <fo:block id="id2852588">
+ <fo:block id="id2869694">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Informal Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Informal Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalExample</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalExample</fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is an example of a trivial, informal example.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalEquation</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalEquation</fo:block>
<fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalTable</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalTable</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -1254,70 +1399,70 @@ index terms, not inlines).
</fo:table-body>
</fo:table>
</fo:block>
- <fo:block id="id2852811">
+ <fo:block id="id2869917">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Admonitions</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Admonitions</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Note</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Note</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="id2869946">
+ <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">Consider yourself noted.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2869969">
+ <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">Consider yourself noted, simply.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NoteTitle</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="id2869985">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NoteTitle</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself noted.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para, with a title.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Att</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="id2870017">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Att</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself noted, simply.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">With a title</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Important</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Important</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Important</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="id2870064">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Important</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself important.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Tip</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Tip</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Tip</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="id2870082">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Tip</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself tipped.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Warning</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Warning</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Warning</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="id2870122">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Warning</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself warned.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Caution</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Caution</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Caution</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="id2870152">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Caution</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself cautioned.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">SimPara in Caution</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Simple Caution</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimPara in Caution</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="id2870182">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Simple Caution</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">A simpler caution.</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2853100">
+ <fo:block id="id2870207">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Other Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Other Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Screen</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screen</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This
is With a line-annotation
a
screen
@@ -1329,12 +1474,12 @@ This
is With a line-annotation
a
screen</fo:block>
- <fo:block font-size="16pt" font-weight="bold">ProgramListing</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ProgramListing</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This
is
a
programlisting</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Address</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Address</fo:block>
<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">Norman Walsh
ArborText, Inc.
1000 Victors Way
@@ -1344,19 +1489,19 @@ US
Voice: 313.997.0200
Fax: 313.997.0201
-Email: <fo:inline font-family="monospace">&lt;nwalsh@arbortext.com&gt;</fo:inline>
+Email: <fo:inline font-family="Courier">&lt;nwalsh@arbortext.com&gt;</fo:inline>
WWW: http://www.arbortext.com/</fo:block>
- <fo:block font-size="16pt" font-weight="bold">BlockQuote</fo:block>
- <fo:block start-indent="1in" end-indent="1in">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">BlockQuote</fo:block>
+ <fo:block start-indent="0.5in" end-indent="0.5in">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Procedure</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Procedure</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
@@ -1371,10 +1516,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second step</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>1.</fo:block>
+ <fo:block>a.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first substep</fo:block>
@@ -1382,7 +1527,7 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>2.</fo:block>
+ <fo:block>b.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second substep</fo:block>
@@ -1401,10 +1546,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Procedure With Title</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Procedure With Title</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:block font-weight="bold">Same Procedure with a Title</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
@@ -1419,10 +1564,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second step</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>1.</fo:block>
+ <fo:block>a.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first substep</fo:block>
@@ -1430,7 +1575,7 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>2.</fo:block>
+ <fo:block>b.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second substep</fo:block>
@@ -1449,24 +1594,27 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">SideBar</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SideBar</fo:block>
<fo:block>
- <fo:block font-weight="bold">What About Bob?</fo:block>
+ <fo:block font-weight="bold" keep-with-next.within-column="always" hyphenate="false">What About Bob?</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a sidebar.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">MsgSet</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">It's not really clear how <fo:inline font-family="monospace">MsgSet</fo:inline> should be presented.
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">MsgSet</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">It's not really clear how <fo:inline font-family="Courier">MsgSet</fo:inline> should be presented.
I expect that it's fairly application, if not document, specific.</fo:block>
<fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record failed CRC</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record <fo:inline font-style="italic" font-family="monospace">n</fo:inline>
- in <fo:inline font-style="italic" font-family="monospace">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record <fo:inline font-style="italic" font-family="Courier">n</fo:inline>
+ in <fo:inline font-style="italic" font-family="Courier">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">File read error on
+ <fo:inline font-style="italic" font-family="Courier">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Panic! Corrupt record!</fo:block>
</fo:block>
<fo:block>
- <fo:block><fo:inline font-weight="bold">Level: </fo:inline>severe</fo:block>
- <fo:block><fo:inline font-weight="bold">Origin: </fo:inline>server</fo:block>
- <fo:block><fo:inline font-weight="bold">Audience: </fo:inline>all</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Level: </fo:inline>severe</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Origin: </fo:inline>server</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Audience: </fo:inline>all</fo:block>
</fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Indicates that some sort of error occured attempting to load
@@ -1475,7 +1623,7 @@ I expect that it's fairly application, if not document, specific.</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">LiteralLayout</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LiteralLayout</fo:block>
<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
literal
layout</fo:block>
@@ -1488,10 +1636,10 @@ literal
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2853841" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2870946" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">5. List Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 5. List Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1502,20 +1650,20 @@ literal
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 5. List Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 5. List Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2853855">
+ <fo:block id="id2870960">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">OrderedLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">OrderedLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Default Numeration</fo:block>
- <fo:list-block id="id2853884" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2853889" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Default Numeration</fo:block>
+ <fo:list-block id="id2870989" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2870994" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1523,17 +1671,17 @@ literal
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2853905" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871010" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">this one starts with
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">this one starts with
a program listing
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2853922" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871027" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1543,7 +1691,7 @@ a synopsis
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2853938" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871044" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1554,18 +1702,18 @@ a synopsis
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2853962" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871068" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>Three</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A
Screen
Here</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2853986" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871091" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -1574,9 +1722,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Arabic Numeration</fo:block>
- <fo:list-block id="id2854022" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854019" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Arabic Numeration</fo:block>
+ <fo:list-block id="id2871128" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871124" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1584,7 +1732,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854045" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1592,7 +1740,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854060" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871165" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1600,7 +1748,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854075" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871181" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1609,9 +1757,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Arabic Numeration (Long)</fo:block>
- <fo:list-block id="id2854112" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854108" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Arabic Numeration (Long)</fo:block>
+ <fo:list-block id="id2871217" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871214" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1619,7 +1767,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854134" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871239" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1627,7 +1775,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871255" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1635,7 +1783,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854166" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871271" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1643,7 +1791,7 @@ Here</fo:block>
<fo:block>Four</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854181" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871286" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
@@ -1651,7 +1799,7 @@ Here</fo:block>
<fo:block>Five</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854197" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871302" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -1659,7 +1807,7 @@ Here</fo:block>
<fo:block>Six</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854213" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871318" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>7.</fo:block>
</fo:list-item-label>
@@ -1667,7 +1815,7 @@ Here</fo:block>
<fo:block>Seven</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854228" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871334" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>8.</fo:block>
</fo:list-item-label>
@@ -1675,7 +1823,7 @@ Here</fo:block>
<fo:block>Eight</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854244" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871349" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>9.</fo:block>
</fo:list-item-label>
@@ -1683,7 +1831,7 @@ Here</fo:block>
<fo:block>Nine</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854260" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871365" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>10.</fo:block>
</fo:list-item-label>
@@ -1691,7 +1839,7 @@ Here</fo:block>
<fo:block>Ten</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854275" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871381" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>11.</fo:block>
</fo:list-item-label>
@@ -1700,9 +1848,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">UpperAlpha Numeration</fo:block>
- <fo:list-block id="id2854312" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854308" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">UpperAlpha Numeration</fo:block>
+ <fo:list-block id="id2871417" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871414" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1710,7 +1858,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854334" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871439" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1718,7 +1866,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854350" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871455" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1726,7 +1874,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854366" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871471" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1735,9 +1883,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">LowerAlpha Numeration</fo:block>
- <fo:list-block id="id2854402" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854398" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LowerAlpha Numeration</fo:block>
+ <fo:list-block id="id2871507" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871504" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1745,7 +1893,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854424" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871530" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1753,7 +1901,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854440" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871545" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1761,7 +1909,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854456" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871561" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1770,9 +1918,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">UpperRoman Numeration</fo:block>
- <fo:list-block id="id2854492" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854489" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">UpperRoman Numeration</fo:block>
+ <fo:list-block id="id2871597" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871594" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1780,7 +1928,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854514" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871620" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1788,7 +1936,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854530" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871635" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1796,7 +1944,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854546" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871651" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1805,9 +1953,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">LowerRoman Numeration</fo:block>
- <fo:list-block id="id2854582" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854579" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LowerRoman Numeration</fo:block>
+ <fo:list-block id="id2871687" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2871684" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1815,7 +1963,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854605" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871710" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1823,7 +1971,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854620" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871726" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1831,7 +1979,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854636" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2871741" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1840,23 +1988,23 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Continued</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Continued</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">First list:
-<fo:list-block id="id2854673" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item id="id2854680" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>One</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854695" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Two</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854711" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Three</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854727" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Four</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
+<fo:list-block id="id2871779" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em"><fo:list-item id="id2871785" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>One</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871800" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Two</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871816" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Three</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871832" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Four</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second list:
-<fo:list-block id="id2854755" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item id="id2854751" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Five</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854777" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Six</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854792" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Seven</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854808" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Eight</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854824" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>5.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Nine</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2854839" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>6.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Ten</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
+<fo:list-block id="id2871860" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em"><fo:list-item id="id2871856" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Five</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871882" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Six</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871898" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Seven</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871913" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Eight</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871929" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>5.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Nine</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2871945" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>6.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Ten</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
</fo:block>
- <fo:block id="id2854858">
+ <fo:block id="id2871963">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ItemizedLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ItemizedLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Default Presentation</fo:block>
- <fo:list-block id="id2854886" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854892" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Default Presentation</fo:block>
+ <fo:list-block id="id2871992" 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="id2871997" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1864,17 +2012,17 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854907" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872013" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">One-point-five. This one starts with
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">One-point-five. This one starts with
a program listing
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854925" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872030" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1882,7 +2030,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854940" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872046" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1890,7 +2038,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2854956" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872061" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1899,9 +2047,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Block Elements in a List</fo:block>
- <fo:list-block id="id2854988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2854994" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Block Elements in a List</fo:block>
+ <fo:list-block id="id2872093" 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="id2872099" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1910,7 +2058,7 @@ what happens?</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another para.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855017" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872122" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1918,7 +2066,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855033" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872138" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1926,7 +2074,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855049" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872154" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1935,9 +2083,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Alternate Mark and OverRide</fo:block>
- <fo:list-block id="id2855085" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855082" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Alternate Mark and OverRide</fo:block>
+ <fo:list-block id="id2872190" 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="id2872188" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1945,7 +2093,7 @@ what happens?</fo:block>
<fo:block>TeX and LaTeX</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855113" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872218" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1953,7 +2101,7 @@ what happens?</fo:block>
<fo:block>Troff</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855128" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872233" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1961,7 +2109,7 @@ what happens?</fo:block>
<fo:block>Lout</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855149" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872254" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1970,9 +2118,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">No mark Presentation</fo:block>
- <fo:list-block id="id2855185" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855197" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">No mark Presentation</fo:block>
+ <fo:list-block id="id2872290" 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="id2872302" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1980,7 +2128,7 @@ what happens?</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855217" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872322" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1988,7 +2136,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855232" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872338" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1996,7 +2144,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855248" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872353" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2006,16 +2154,16 @@ what happens?</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2855267">
+ <fo:block id="id2872372">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">VariableLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">VariableLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2855282" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855288" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2872387" 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="id2872394" 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>Term1</fo:inline>
@@ -2029,7 +2177,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855326" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872431" 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>Term2</fo:inline>
@@ -2043,7 +2191,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855364" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872469" 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>Term3</fo:inline>
@@ -2055,8 +2203,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
- <fo:list-block id="id2855398" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855404" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2872503" 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="id2872510" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2064,7 +2212,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855420" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872525" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2072,7 +2220,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855436" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872541" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2080,7 +2228,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855451" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872557" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2096,7 +2244,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855486" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872591" 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>Term4</fo:inline>
@@ -2111,8 +2259,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:list-block id="id2855526" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855532" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2872631" 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="id2872637" 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>Another List</fo:inline>
@@ -2126,14 +2274,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855570" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2872675" 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>ProgramListing</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A ProgramListing
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A ProgramListing
Is the First Element
of this VarListEntry</fo:block>
<fo:block>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -2145,18 +2293,18 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2855620">
+ <fo:block id="id2872725">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Inline</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inline</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">An inline simple list:
<fo:inline>One, Two, Three, Four, Five, Six, Seven</fo:inline></fo:block>
- <fo:block font-size="16pt" font-weight="bold">Horiz</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Horiz</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
@@ -2194,7 +2342,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Vert</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Vert</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
@@ -2233,16 +2381,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-body>
</fo:table>
</fo:block>
- <fo:block id="id2855894">
+ <fo:block id="id2873000">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">More Complex List Item Content</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">More Complex List Item Content</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2855909" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2855916" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2873014" 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="id2873021" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2251,7 +2399,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855939" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873044" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2260,16 +2408,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855963" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873068" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Three</fo:block>
+ <fo:block>Three</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2855986" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873091" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2278,16 +2426,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856010" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873115" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">Formal Element</fo:inline>Five</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">Formal Element</fo:inline>Five</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856049" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873154" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2296,8 +2444,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:list-block id="id2856066" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2856073" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2873172" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2873178" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -2306,7 +2454,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856096" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873201" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -2315,16 +2463,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856120" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873225" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Three</fo:block>
+ <fo:block>Three</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856143" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873248" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -2333,16 +2481,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856167" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873272" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">Formal Element</fo:inline>Five</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">Formal Element</fo:inline>Five</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2856206" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2873311" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -2352,11 +2500,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2856225">
+ <fo:block id="id2873330">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Segmented List</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Segmented List</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2464,10 +2612,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2857419" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2874524" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">6. Table Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 6. Table Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -2478,57 +2626,57 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 6. Table Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 6. Table Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Alternate Alignment on Entry</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Alternate Alignment on Entry</fo:block>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-body>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>left</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>right</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>right</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
- <fo:table-header>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-header border-top="0.5pt solid black ">
<fo:table-row>
<fo:table-cell>
<fo:block>h1</fo:block>
@@ -2541,7 +2689,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
- <fo:table-body>
+ <fo:table-body border-bottom="0.5pt solid black ">
<fo:table-row>
<fo:table-cell>
<fo:block>left</fo:block>
@@ -2567,9 +2715,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-body>
</fo:table>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -2597,14 +2745,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">center literal</fo:inline>
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">center literal</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">center filename</fo:inline>
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">center filename</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2618,11 +2766,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Absolute Widths</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Absolute Widths</fo:block>
<fo:table>
- <fo:table-column column-number="1" column-width="1in"/>
- <fo:table-column column-number="2" column-width="1in"/>
- <fo:table-column column-number="3" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="1in"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -2672,10 +2820,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Relative Widths</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Relative Widths</fo:block>
<fo:table table-layout="fixed">
- <fo:table-column column-number="1" column-width="proportional-column-width(3)"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(2)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="proportional-column-width(3)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="proportional-column-width(2)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2703,14 +2851,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Complex</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Complex</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
- <fo:table-column column-number="4"/>
- <fo:table-column column-number="5"/>
- <fo:table-column column-number="6"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="4"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="5"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="6"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2736,10 +2884,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:table-cell>
<fo:block>B1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-right="0.5pt solid black " padding-right="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>B2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>B3</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2753,7 +2901,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:table-cell>
<fo:block>C1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-right="0.5pt solid black " padding-right="2pt">
<fo:block>C2</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2810,10 +2958,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">With Footnotes</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">With Footnotes</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2835,23 +2983,23 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">A Big One</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A Big One</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
- <fo:table-column column-number="4"/>
- <fo:table-column column-number="5"/>
- <fo:table-column column-number="6"/>
- <fo:table-column column-number="7"/>
- <fo:table-column column-number="8"/>
- <fo:table-column column-number="9"/>
- <fo:table-column column-number="10"/>
- <fo:table-column column-number="11"/>
- <fo:table-column column-number="12"/>
- <fo:table-column column-number="13"/>
- <fo:table-column column-number="14"/>
- <fo:table-column column-number="15"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="4"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="5"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="6"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="7"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="8"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="9"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="10"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="11"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="12"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="13"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="14"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="15"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -4316,10 +4464,10 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
</fo:table>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2863080" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2880186" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">7. Index Term Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 7. Index Term Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4330,7 +4478,7 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 7. Index Term Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 7. Index Term Tests</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Test data.</fo:block>
@@ -4340,11 +4488,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:wrapper id="idx2">
<!--chap-level-->
</fo:wrapper>
- <fo:block id="id2863152">
+ <fo:block id="id2880257">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4370,17 +4518,17 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:wrapper id="idx9">
<!--chap-level, sec, tert-->
</fo:wrapper>
- <fo:wrapper id="id2863397">
+ <fo:wrapper id="id2880503">
<!--chap-level, sec, tert-->
</fo:wrapper>
<fo:wrapper id="idx11">
<!--sect1-level-->
</fo:wrapper>
- <fo:block id="id2863454">
+ <fo:block id="id2880559">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 2</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 2</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4398,11 +4546,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<!--chap-level, sec, tert-->
</fo:wrapper>
</fo:block>
- <fo:block id="id2863597">
+ <fo:block id="id2880702">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 3</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 3</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4415,15 +4563,15 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>II. Part Two Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Part Two Title</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2863649" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2880754" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">8. CmdSynopsis Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 8. CmdSynopsis Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4434,27 +4582,27 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 8. CmdSynopsis Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 8. CmdSynopsis Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Very Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cd</fo:inline> {<fo:inline font-style="italic" font-family="monospace">directory</fo:inline>}</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cal</fo:inline> [-j] [-y] [month [year]]</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Another Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">chgrp</fo:inline> [-R
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Very Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cd</fo:inline> {<fo:inline font-style="italic" font-family="Courier">directory</fo:inline>}</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cal</fo:inline> [-j] [-y] [month [year]]</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">chgrp</fo:inline> [-R
[-H | -L | -P]
- ] [-f] <fo:inline font-style="italic" font-family="monospace">group</fo:inline> <fo:inline font-style="italic" font-family="monospace">file</fo:inline>... </fo:block>
- <fo:block font-size="16pt" font-weight="bold">Slightly Complex CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">emacs</fo:inline> [-t <fo:inline font-style="italic" font-family="monospace">file</fo:inline>] [-q] [-u <fo:inline font-style="italic" font-family="monospace">user</fo:inline>] [+<fo:inline font-style="italic" font-family="monospace">number</fo:inline>] [-f <fo:inline font-style="italic" font-family="monospace">function</fo:inline>...] [-l <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] <fo:inline font-style="italic" font-family="monospace">file</fo:inline>... </fo:block>
- <fo:block font-size="16pt" font-weight="bold">Quite Complex CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cccp</fo:inline> [-$] [-C] [-D<fo:inline font-style="italic" font-family="monospace">name</fo:inline> [=<fo:inline font-style="italic" font-family="monospace">definition</fo:inline>]...] [-dD] [-dM] [-I <fo:inline font-style="italic" font-family="monospace">directory</fo:inline>...] [-H] [-I-] [-imacros <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] [-include <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<fo:inline font-style="italic" font-family="monospace">name</fo:inline>] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<fo:inline font-style="italic" font-family="monospace">infile</fo:inline> | -} {<fo:inline font-style="italic" font-family="monospace">outfile</fo:inline> | -}</fo:block>
+ ] [-f] <fo:inline font-style="italic" font-family="Courier">group</fo:inline> <fo:inline font-style="italic" font-family="Courier">file</fo:inline>... </fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Slightly Complex CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">emacs</fo:inline> [-t <fo:inline font-style="italic" font-family="Courier">file</fo:inline>] [-q] [-u <fo:inline font-style="italic" font-family="Courier">user</fo:inline>] [+<fo:inline font-style="italic" font-family="Courier">number</fo:inline>] [-f <fo:inline font-style="italic" font-family="Courier">function</fo:inline>...] [-l <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] <fo:inline font-style="italic" font-family="Courier">file</fo:inline>... </fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Quite Complex CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cccp</fo:inline> [-$] [-C] [-D<fo:inline font-style="italic" font-family="Courier">name</fo:inline> [=<fo:inline font-style="italic" font-family="Courier">definition</fo:inline>]...] [-dD] [-dM] [-I <fo:inline font-style="italic" font-family="Courier">directory</fo:inline>...] [-H] [-I-] [-imacros <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] [-include <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<fo:inline font-style="italic" font-family="Courier">name</fo:inline>] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<fo:inline font-style="italic" font-family="Courier">infile</fo:inline> | -} {<fo:inline font-style="italic" font-family="Courier">outfile</fo:inline> | -}</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2864406" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2881511" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">9. FuncSynopsis Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 9. FuncSynopsis Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4465,33 +4613,33 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 9. FuncSynopsis Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 9. FuncSynopsis Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Two Simple Parameters</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Two Simple Parameters</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(int1, int2);int int1;int int2;</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(int1, int2);int int1;int int2;</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Variable Arguments</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Variable Arguments</fo:block>
<fo:block>
<fo:block>#include &lt;varargs.h&gt;</fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(...);</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(...);</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Void</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Void</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">rand</fo:inline></fo:inline>();</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">rand</fo:inline></fo:inline>();</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Function Pointer Arguments</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Function Pointer Arguments</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">void <fo:inline font-weight="bold">qsort</fo:inline></fo:inline>(dataptr, left, right, (* comp));void *dataptr[];int left;int right;int (* comp)
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">void <fo:inline font-weight="bold">qsort</fo:inline></fo:inline>(dataptr, left, right, (* comp));void *dataptr[];int left;int right;int (* comp)
(void *, void *);</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2864702" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2881808" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">10. Callout Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 10. Callout Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4502,11 +4650,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 10. Callout Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 10. Callout Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">CallOut (using AREASPEC)</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">@rem = '--*-Perl-*--
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CallOut (using AREASPEC)</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">@rem = '--*-Perl-*--
@echo off
perl.exe %_batchname %$
goto endofperl
@@ -4537,92 +4685,78 @@ while (@DIRS) {
}
exit;</fo:block>
- <fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
+ <fo:block id="id2882016">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2882024">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- </fo:block>
+ <fo:block>&#x2776;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The prologue handles embedding a Perl script in a DOS batch file.</fo:block>
+ <fo:block>The prologue handles embedding a Perl script in a DOS batch file.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882052">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">goto</fo:inline> statement, interpreted by the DOS batch
+ <fo:block>The <fo:inline font-family="Courier">goto</fo:inline> statement, interpreted by the DOS batch
file interpreter, skips over the body of the Perl script.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882089">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/3.png"/>
- </fo:block>
+ <fo:block>&#x2778;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">require</fo:inline> statement sources in external program
+ <fo:block>The <fo:inline font-family="Courier">require</fo:inline> statement sources in external program
fragments.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882126">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/4.png"/>
- </fo:block>
+ <fo:block>&#x2779;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">use</fo:inline> statement is similar, but has additional
+ <fo:block>The <fo:inline font-family="Courier">use</fo:inline> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
both a line and a column.)</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882163">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/5.png"/>
- </fo:block>
+ <fo:block>&#x277A;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a user subroutine call.</fo:block>
+ <fo:block>This is a user subroutine call.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">CallOut (using CO)</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">this is a line
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CallOut (using CO)</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">this is a line
this is another line
-there's a <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>callout in here.
+there's a <fo:inline id="callout1">&#x2776;</fo:inline>callout in here.
and there's another on the
next line
-right here:<fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block></fo:block>
- <fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
+right here:<fo:inline id="callout2">&#x2777;</fo:inline></fo:block>
+ <fo:block id="id2882229">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2882249">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- </fo:block>
+ <fo:block>&#x2776;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">First callout.</fo:block>
+ <fo:block>First callout.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para in first callout.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882285">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+ <fo:block>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -4631,26 +4765,23 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Third para in second callout.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2882335">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2776;&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This paragraph describes <fo:inline font-style="italic">both</fo:inline> callouts.</fo:block>
+ <fo:block>This paragraph describes <fo:inline font-style="italic">both</fo:inline> callouts.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2865265" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2882371" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>III. A Reference Part</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Reference Part</fo:block>
</fo:block>
</fo:block>
</fo:flow>
@@ -4658,20 +4789,20 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>I. Reference</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Reference</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2882408" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
</fo:block>
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
- <fo:block font-size="20pt" font-weight="bold">What about the title?</fo:block>
+ <fo:block font-size="20pt" font-weight="bold">RefEntryTitle</fo:block>
<fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block>RefName1, <fo:block font-size="18pt" font-weight="bold">Name</fo:block>RefName2 -- Yes, there must be a purpose!</fo:block>
<fo:block>
<fo:block font-size="18pt" font-weight="bold">Synopsis (what about the title?)</fo:block>
@@ -4707,19 +4838,19 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2882593" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
</fo:block>
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
- <fo:block font-size="20pt" font-weight="bold">What about the title?</fo:block>
- <fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block><fo:inline font-family="monospace">Chop</fo:inline> -- strip trailing whitespace</fo:block>
+ <fo:block font-size="20pt" font-weight="bold">Chop</fo:block>
+ <fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block><fo:inline font-family="Courier">Chop</fo:inline> -- strip trailing whitespace</fo:block>
<fo:block>
<fo:block font-size="18pt" font-weight="bold">Description</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Returns the argument string without trailing whitespace.
- <fo:block keep-with-next.within-column="always" id="id2865542"/><fo:block keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt">Example 2. chop() example</fo:block><fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">$trimmed = Chop($line);</fo:block></fo:block>
+ <fo:block id="id2882647" 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">chop() example</fo:block><fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">$trimmed = Chop($line);</fo:block></fo:block>
</fo:block>
</fo:block>
</fo:flow>
@@ -4727,7 +4858,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:page-sequence id="appendix" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. A Very Short Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. A Very Short Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4738,16 +4869,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. A Very Short Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. A Very Short Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2865608" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2882713" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">B. A Very Long Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. A Very Long Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4758,7 +4889,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix B. A Very Long Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix B. A Very Long Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -4991,11 +5122,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
- <fo:block id="id2866258">
+ <fo:block id="id2883363">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5005,11 +5136,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866288">
+ <fo:block id="id2883394">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5019,11 +5150,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866319">
+ <fo:block id="id2883424">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5033,11 +5164,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866358">
+ <fo:block id="id2883464">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5047,11 +5178,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866389">
+ <fo:block id="id2883494">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5066,11 +5197,11 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2866428">
+ <fo:block id="id2883533">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect1 subtitle</fo:block>
@@ -5081,11 +5212,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866483">
+ <fo:block id="id2883588">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect2 subtitle</fo:block>
@@ -5096,11 +5227,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866537">
+ <fo:block id="id2883642">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect3 subtitle</fo:block>
@@ -5111,11 +5242,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866592">
+ <fo:block id="id2883697">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect4 subtitle</fo:block>
@@ -5126,11 +5257,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2866646">
+ <fo:block id="id2883751">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect5 subtitle</fo:block>
@@ -5146,11 +5277,11 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2866718">
+ <fo:block id="id2883823">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5161,11 +5292,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
</fo:block>
- <fo:block id="id2866750">
+ <fo:block id="id2883855">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5187,16 +5318,16 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>A Test Bibliography</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Test Bibliography</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Books</fo:block>
- <fo:block id="id2866832">
+ <fo:block id="id2883937" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[AhoSethiUllman96] </fo:inline>
- <fo:inline>Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
+ <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
<fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
<fo:inline>
<fo:inline>Addison-Wesley Publishing Company. </fo:inline>
@@ -5215,7 +5346,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Periodicals</fo:block>
- <fo:block id="walsh97">
+ <fo:block id="walsh97" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Walsh97] </fo:inline>
<fo:inline>&quot;A Guide to XML&quot;. <fo:inline>Norman Walsh. </fo:inline><fo:inline>1997. </fo:inline><fo:inline>Copyright &#xA9; 1997 ArborText, Inc.. </fo:inline><fo:inline>97-108. </fo:inline></fo:inline>
<fo:inline><fo:inline font-style="italic">XML: Principles, Tools, and Techniques</fo:inline>. <fo:inline><fo:inline>O'Reilly &amp; Associates, Inc.. </fo:inline></fo:inline><fo:inline>1085-2301. </fo:inline><fo:inline>Dan Connolly. </fo:inline></fo:inline>
@@ -5228,7 +5359,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
<fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
<fo:inline>The World Wide Web Consortium</fo:inline>.
<fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
- <fo:block id="id2867377">
+ <fo:block id="id2884482" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Abbrev] </fo:inline>
<fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
<fo:inline>Subtitle. </fo:inline>
@@ -5241,7 +5372,7 @@ Abstract, abstract, abstract. Abstract, abstract, abstract. </fo:block>. </fo:in
<fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>
- <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>
<fo:inline>ArtPageNums. </fo:inline>
@@ -5252,12 +5383,12 @@ AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. </fo:block>. </fo:inline>
<fo:inline>AuthorInitials. </fo:inline>
- <fo:inline><fo:block color="red">&lt;collabname&gt;The names of some collaborators&lt;/collabname&gt;</fo:block><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>The names of some collaborators. </fo:inline><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>. </fo:inline>
- <fo:inline><fo:block color="red">&lt;confdates&gt;confdates&lt;/confdates&gt;</fo:block><fo:block color="red">&lt;conftitle&gt;conftitle&lt;/conftitle&gt;</fo:block><fo:block color="red">&lt;confnum&gt;confnum&lt;/confnum&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>confdates. </fo:inline><fo:inline>conftitle. </fo:inline><fo:inline>confnum. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
-USA. </fo:inline><fo:block color="red">&lt;confsponsor&gt;confsponsor&lt;/confsponsor&gt;</fo:block>. </fo:inline>
+USA. </fo:inline><fo:inline>confsponsor. </fo:inline>. </fo:inline>
<fo:inline>ContractNum. </fo:inline>
<fo:inline>ContractSponsor. </fo:inline>
<fo:inline>Contrib. </fo:inline>
@@ -5315,42 +5446,42 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Example Glossary</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is not a real glossary, it's just an example.</fo:block>
<fo:block font-size="16pt" font-weight="bold">E</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="xml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Extensible Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Standard Generalized
- Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
<fo:block font-size="16pt" font-weight="bold">S</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="id2885423" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>SGML</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
- <fo:block>See Standard Generalized
- Markup Language.</fo:block>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>See <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="sgml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Standard Generalized
Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Extensible Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="xml">Extensible Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -5365,14 +5496,14 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Index</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test index.</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">a formal para</fo:inline>this is a formal paragraph.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">a formal para</fo:inline>this is a formal paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2868802" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2885907" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -5381,7 +5512,7 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">An Index with a Title</fo:block>
</fo:block>
</fo:block>
<fo:block>
diff --git a/tests/docbook/result/fo/book3.fo b/tests/docbook/result/fo/book3.fo
index ad4194fe..54ef8df8 100644
--- a/tests/docbook/result/fo/book3.fo
+++ b/tests/docbook/result/fo/book3.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" keep-with-next="always" space-before="2in">Some Corporation</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">Norman Walsh</fo:block>
@@ -99,10 +99,10 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt">
<fo:block>
- <fo:block font-weight="bold" font-size="12pt">Legal Notice</fo:block>
+ <fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Legal Notice</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test document. You can do what you will with it.</fo:block>
</fo:block>
</fo:block>
@@ -125,14 +125,26 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>A Test Bibliography<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="bib1"/></fo:block>
- <fo:block>Example Glossary<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="gloss"/></fo:block>
- <fo:block>Index<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="index"/></fo:block>
- <fo:block>Index<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741410"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> A Test Bibliography</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="bib1"><fo:page-number-citation ref-id="bib1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Example Glossary</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="gloss"><fo:page-number-citation ref-id="gloss"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="index"><fo:page-number-citation ref-id="index"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758623"><fo:page-number-citation ref-id="id2758623"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -145,16 +157,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>A Test Bibliography</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Test Bibliography</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Books</fo:block>
- <fo:block id="id2836808">
+ <fo:block id="id2761246" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[AhoSethiUllman96] </fo:inline>
- <fo:inline>Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
+ <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
<fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
<fo:inline>
<fo:inline>Addison-Wesley Publishing Company. </fo:inline>
@@ -166,7 +178,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Periodicals</fo:block>
- <fo:block id="walsh97">
+ <fo:block id="walsh97" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Walsh97] </fo:inline>
<fo:inline>&quot;A Guide to XML&quot;. <fo:inline>Norman Walsh. </fo:inline><fo:inline>1997. </fo:inline><fo:inline>Copyright &#xA9; 1997 ArborText, Inc.. </fo:inline><fo:inline>97-108. </fo:inline></fo:inline>
<fo:inline><fo:inline font-style="italic">XML: Principles, Tools, and Techniques</fo:inline>. <fo:inline><fo:inline>O'Reilly &amp; Associates, Inc.. </fo:inline></fo:inline><fo:inline>1085-2301. </fo:inline><fo:inline>Dan Connolly. </fo:inline></fo:inline>
@@ -179,7 +191,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
<fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
<fo:inline>The World Wide Web Consortium</fo:inline>.
<fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
- <fo:block id="id2743927">
+ <fo:block id="id2759364" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Abbrev] </fo:inline>
<fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
<fo:inline>Subtitle. </fo:inline>
@@ -192,7 +204,7 @@ Abstract, abstract, abstract. Abstract, abstract, abstract. </fo:block>. </fo:in
<fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>
- <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>
<fo:inline>ArtPageNums. </fo:inline>
@@ -203,12 +215,12 @@ AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. </fo:block>. </fo:inline>
<fo:inline>AuthorInitials. </fo:inline>
- <fo:inline><fo:block color="red">&lt;collabname&gt;The names of some collaborators&lt;/collabname&gt;</fo:block><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>The names of some collaborators. </fo:inline><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>. </fo:inline>
- <fo:inline><fo:block color="red">&lt;confdates&gt;confdates&lt;/confdates&gt;</fo:block><fo:block color="red">&lt;conftitle&gt;conftitle&lt;/conftitle&gt;</fo:block><fo:block color="red">&lt;confnum&gt;confnum&lt;/confnum&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>confdates. </fo:inline><fo:inline>conftitle. </fo:inline><fo:inline>confnum. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
-USA. </fo:inline><fo:block color="red">&lt;confsponsor&gt;confsponsor&lt;/confsponsor&gt;</fo:block>. </fo:inline>
+USA. </fo:inline><fo:inline>confsponsor. </fo:inline>. </fo:inline>
<fo:inline>ContractNum. </fo:inline>
<fo:inline>ContractSponsor. </fo:inline>
<fo:inline>Contrib. </fo:inline>
@@ -262,42 +274,42 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Example Glossary</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is not a real glossary, it's just an example.</fo:block>
<fo:block font-size="16pt" font-weight="bold">E</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="xml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Extensible Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Standard Generalized
- Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
<fo:block font-size="16pt" font-weight="bold">S</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="id2758089" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>SGML</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
- <fo:block>See Standard Generalized
- Markup Language.</fo:block>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>See <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="sgml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Standard Generalized
Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Extensible Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="xml">Extensible Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -312,14 +324,14 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Index</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test index.</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">a formal para</fo:inline>this is a formal paragraph.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">a formal para</fo:inline>this is a formal paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2741410" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2758623" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -328,7 +340,7 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Index</fo:block>
</fo:block>
</fo:block>
<fo:block>
diff --git a/tests/docbook/result/fo/callout.fo b/tests/docbook/result/fo/callout.fo
index 5995107f..616e552e 100644
--- a/tests/docbook/result/fo/callout.fo
+++ b/tests/docbook/result/fo/callout.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -90,15 +90,15 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Loops</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Loops</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-<fo:wrapper id="id2745670"><!--for loop, DSSSL and--></fo:wrapper>
-<fo:wrapper id="id2745680"><!--loops, implementing (DSSSL)--></fo:wrapper>
-<fo:wrapper id="id2745690"><!--tail recursion (DSSSL)--></fo:wrapper>
+<fo:wrapper id="id2761018"><!--for loop, DSSSL and--></fo:wrapper>
+<fo:wrapper id="id2761028"><!--loops, implementing (DSSSL)--></fo:wrapper>
+<fo:wrapper id="id2761038"><!--tail recursion (DSSSL)--></fo:wrapper>
DSSSL doesn't have any construct that resembles the
for loop that occurs in most imperative languages like C
@@ -107,82 +107,70 @@ functional languages for implementing a loop: tail recursion.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Loops in DSSSL use a special form of
-<fo:inline font-family="monospace">let</fo:inline>. This loop counts from 1 to 10:
-<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
-(let <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>loopvar <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>((count 1))
- <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>(if (&gt; count 10)
- <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>#t
- (<fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>loopvar <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>(+ count 1))))</fo:block></fo:block>
- <fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
+<fo:inline font-family="Courier">let</fo:inline>. This loop counts from 1 to 10:
+<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
+(let <fo:inline id="dl1">&#x2776;</fo:inline>loopvar <fo:inline id="dl2">&#x2777;</fo:inline>((count 1))
+ <fo:inline id="dl3">&#x2778;</fo:inline>(if (&gt; count 10)
+ <fo:inline id="dl4">&#x2779;</fo:inline>#t
+ (<fo:inline id="dl5">&#x277A;</fo:inline>loopvar <fo:inline id="dl6">&#x277B;</fo:inline>(+ count 1))))</fo:block></fo:block>
+ <fo:block id="id2761211">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2761221">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- </fo:block>
+ <fo:block>&#x2776;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This variable controls the loop. It is declared without an
-initial value, immediately after the <fo:inline font-family="monospace">let</fo:inline>
+ <fo:block>This variable controls the loop. It is declared without an
+initial value, immediately after the <fo:inline font-family="Courier">let</fo:inline>
operand.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2761361">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-<fo:wrapper id="id2741855"><!--variables (DSSSL), local, defining after loop variable--></fo:wrapper>
+ <fo:block>
+<fo:wrapper id="id2761385"><!--variables (DSSSL), local, defining after loop variable--></fo:wrapper>
Any number of additional local variables can be defined after
the loop variable, just as they can in any other
-<fo:inline font-family="monospace">let</fo:inline> expression.</fo:block>
+<fo:inline font-family="Courier">let</fo:inline> expression.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2761422">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/3.png"/>
- </fo:block>
+ <fo:block>&#x2778;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">If you ever want the loop to end, you have to put some sort of a
+ <fo:block>If you ever want the loop to end, you have to put some sort of a
test in it.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2761190">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/4.png"/>
- </fo:block>
+ <fo:block>&#x2779;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the value that will be returned.</fo:block>
+ <fo:block>This is the value that will be returned.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2853795">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/5.png"/>
- </fo:block>
+ <fo:block>&#x277A;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Note that you iterate the loop by using the loop variable as if
+ <fo:block>Note that you iterate the loop by using the loop variable as if
it was a function name.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2853828">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/6.png"/>
- </fo:block>
+ <fo:block>&#x277B;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The arguments to this function are the values that
-you want the local variables declared in <fo:basic-link internal-destination="dl2"><fo:external-graphic src="../images/callouts/2.png"/></fo:basic-link> to have
+ <fo:block>The arguments to this function are the values that
+you want the local variables declared in <fo:basic-link internal-destination="dl2">&#x2777;</fo:basic-link> to have
in the next iteration.</fo:block>
</fo:list-item-body>
</fo:list-item>
diff --git a/tests/docbook/result/fo/chunk.fo b/tests/docbook/result/fo/chunk.fo
index 396b726f..02b819d5 100644
--- a/tests/docbook/result/fo/chunk.fo
+++ b/tests/docbook/result/fo/chunk.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2787333" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2804440" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -93,7 +93,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
@@ -104,20 +104,44 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="preface"/></fo:block>
- <fo:block>1.XRef Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="xreftest"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="preface"><fo:page-number-citation ref-id="preface"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 XRef Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="xreftest"><fo:page-number-citation ref-id="xreftest"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>First sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744596"/></fo:block>
- <fo:block>Second sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744617"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760979"><fo:page-number-citation ref-id="id2760979"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Second sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761000"><fo:page-number-citation ref-id="id2761000"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Second Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 Third Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760883"><fo:page-number-citation ref-id="id2760883"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="appendix"><fo:page-number-citation ref-id="appendix"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">B Second Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804578"><fo:page-number-citation ref-id="id2804578"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>2.Second Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
- <fo:block>3.Third Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744501"/></fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="appendix"/></fo:block>
- <fo:block>B.Second Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741915"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -130,13 +154,13 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>First Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">First Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2746033" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2762629" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -145,7 +169,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test.</fo:block>
@@ -160,7 +184,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph. (<fo:basic-link internal-destination="chapter">chapter</fo:basic-link>)</fo:block>
@@ -169,7 +193,7 @@
<fo:page-sequence id="xreftest" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. XRef Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -180,7 +204,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. XRef Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
@@ -195,21 +219,21 @@
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:basic-link internal-destination="appendix">Appendix</fo:basic-link>
</fo:block>
- <fo:block id="id2744596">
+ <fo:block id="id2760979">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">...</fo:block>
</fo:block>
- <fo:block id="id2744617">
+ <fo:block id="id2761000">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -220,7 +244,7 @@
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Second Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Second Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -231,16 +255,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. Second Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. Second Chapter</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2744501" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2760883" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. Third Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Third Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -251,7 +275,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 3. Third Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 3. Third Chapter</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
@@ -260,7 +284,7 @@
<fo:page-sequence id="appendix" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -271,7 +295,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
@@ -327,10 +351,10 @@ This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2741915" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2804578" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">B. Second Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. Second Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -341,7 +365,7 @@ This makes the appendix long. This makes the appendix long.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix B. Second Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix B. Second Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
diff --git a/tests/docbook/result/fo/classsynop.fo b/tests/docbook/result/fo/classsynop.fo
index c665f03a..67569dab 100644
--- a/tests/docbook/result/fo/classsynop.fo
+++ b/tests/docbook/result/fo/classsynop.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,10 +81,10 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2836713" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2756502" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Class Synopses</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Class Synopses</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -95,14 +95,14 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Class Synopses</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Class Synopses</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This example is Perl; it's the standard DirHandle module. I've
cut out the code, so you'll have to trust me on the parameters.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">ProgramListing version:</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
package DirHandle;
require 5.000;
@@ -113,15 +113,15 @@ sub new {
}
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">ClassSynopsis version:</fo:block>
- <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">DirHandle</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">superclass1</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">superclass2</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;classsynopsisinfo&gt;
+ <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">DirHandle</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">superclass1</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">superclass2</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;classsynopsisinfo&gt;
require 5.000;
use Carp;
use Symbol;
-&lt;/classsynopsisinfo&gt;</fo:block><fo:block color="red">&lt;constructorsynopsis&gt;<fo:inline font-family="monospace">new</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:inline font-style="italic" font-family="monospace">$dirname</fo:inline>&lt;/methodparam&gt;</fo:block>&lt;/constructorsynopsis&gt;</fo:block><fo:block color="red">&lt;destructorsynopsis&gt;<fo:inline font-family="monospace">DESTROY</fo:inline>&lt;/destructorsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
+&lt;/classsynopsisinfo&gt;</fo:block><fo:block color="red">&lt;constructorsynopsis&gt;<fo:inline font-family="Courier">new</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:inline font-style="italic" font-family="Courier">$dirname</fo:inline>&lt;/methodparam&gt;</fo:block>&lt;/constructorsynopsis&gt;</fo:block><fo:block color="red">&lt;destructorsynopsis&gt;<fo:inline font-family="Courier">DESTROY</fo:inline>&lt;/destructorsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This example is IDL from the DOM spec.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">ProgramListing version:</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
interface Element : Node {
readonly attribute DOMString tagName;
DOMString getAttribute(in DOMString name);
@@ -131,16 +131,16 @@ interface Element : Node {
};
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">ClassSynopsis version:</fo:block>
- <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">Element</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">Node</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;readonly&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;attribute&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-family="monospace">tagName</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;DOMString<fo:inline font-family="monospace">getAttribute</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="monospace">name</fo:inline>&lt;/methodparam&gt;</fo:block>&lt;/methodsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;();<fo:inline font-family="monospace">setAttribute</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="monospace">name</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="monospace">value</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="monospace">DOMException</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
- <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block><fo:inline font-family="monospace">TextFileWriter</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">Superclass1</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">Superclass2</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;oointerface&gt;<fo:inline font-family="monospace">Interface1</fo:inline>&lt;/oointerface&gt;</fo:block><fo:block color="red">&lt;oointerface&gt;<fo:inline font-family="monospace">Interface2</fo:inline>&lt;/oointerface&gt;</fo:block><fo:block color="red">&lt;ooexception&gt;<fo:inline font-family="monospace">Exception1</fo:inline>&lt;/ooexception&gt;</fo:block><fo:block color="red">&lt;ooexception&gt;<fo:inline font-family="monospace">Exception2</fo:inline>&lt;/ooexception&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;private&lt;/modifier&gt;</fo:block>Writer<fo:inline font-family="monospace">writer</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>String<fo:inline font-family="monospace">writerName</fo:inline><fo:block color="red">&lt;initializer&gt;&quot;MyWriter&quot;&lt;/initializer&gt;</fo:block>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;<fo:block color="red">&lt;modifier&gt;static&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>();<fo:inline font-family="monospace">write</fo:inline><fo:block color="red">&lt;methodparam&gt;ResultTreeFragment<fo:inline font-style="italic" font-family="monospace">frag</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;String<fo:inline font-style="italic" font-family="monospace">file</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="monospace">Exception1</fo:inline><fo:inline font-family="monospace">Exception2</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">Element</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">Node</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;readonly&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;attribute&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-family="Courier">tagName</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;DOMString<fo:inline font-family="Courier">getAttribute</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="Courier">name</fo:inline>&lt;/methodparam&gt;</fo:block>&lt;/methodsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;();<fo:inline font-family="Courier">setAttribute</fo:inline><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="Courier">name</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;<fo:block color="red">&lt;modifier&gt;in&lt;/modifier&gt;</fo:block>DOMString<fo:inline font-style="italic" font-family="Courier">value</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="Courier">DOMException</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
+ <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block><fo:inline font-family="Courier">TextFileWriter</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">Superclass1</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">Superclass2</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;oointerface&gt;<fo:inline font-family="Courier">Interface1</fo:inline>&lt;/oointerface&gt;</fo:block><fo:block color="red">&lt;oointerface&gt;<fo:inline font-family="Courier">Interface2</fo:inline>&lt;/oointerface&gt;</fo:block><fo:block color="red">&lt;ooexception&gt;<fo:inline font-family="Courier">Exception1</fo:inline>&lt;/ooexception&gt;</fo:block><fo:block color="red">&lt;ooexception&gt;<fo:inline font-family="Courier">Exception2</fo:inline>&lt;/ooexception&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;private&lt;/modifier&gt;</fo:block>Writer<fo:inline font-family="Courier">writer</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>String<fo:inline font-family="Courier">writerName</fo:inline><fo:block color="red">&lt;initializer&gt;&quot;MyWriter&quot;&lt;/initializer&gt;</fo:block>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;<fo:block color="red">&lt;modifier&gt;static&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>();<fo:inline font-family="Courier">write</fo:inline><fo:block color="red">&lt;methodparam&gt;ResultTreeFragment<fo:inline font-style="italic" font-family="Courier">frag</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;String<fo:inline font-style="italic" font-family="Courier">file</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="Courier">Exception1</fo:inline><fo:inline font-family="Courier">Exception2</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
class Rectangle_with_data: virtual Shape, virtual Data_container
{
...
};
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">ClassSynopsis version:</fo:block>
- <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">Rectangle_with_data</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;virtual&lt;/modifier&gt;</fo:block><fo:inline font-family="monospace">Shape</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;virtual&lt;/modifier&gt;</fo:block><fo:inline font-family="monospace">Data_container</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;classsynopsisinfo&gt;...&lt;/classsynopsisinfo&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
+ <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">Rectangle_with_data</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;virtual&lt;/modifier&gt;</fo:block><fo:inline font-family="Courier">Shape</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;virtual&lt;/modifier&gt;</fo:block><fo:inline font-family="Courier">Data_container</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;classsynopsisinfo&gt;...&lt;/classsynopsisinfo&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
diff --git a/tests/docbook/result/fo/condition.fo b/tests/docbook/result/fo/condition.fo
index cd95677f..1418fa6d 100644
--- a/tests/docbook/result/fo/condition.fo
+++ b/tests/docbook/result/fo/condition.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" keep-with-next="always" space-before="2in">Some Corporation</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">Norman Walsh</fo:block>
@@ -99,10 +99,10 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt">
<fo:block>
- <fo:block font-weight="bold" font-size="12pt">Legal Notice</fo:block>
+ <fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Legal Notice</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test document. You can do what you will with it.</fo:block>
</fo:block>
</fo:block>
@@ -125,123 +125,258 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Preface Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742200"/></fo:block>
- <fo:block>I.Part One Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742240"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Preface Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2854003"><fo:page-number-citation ref-id="id2854003"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">I Part One Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2880148"><fo:page-number-citation ref-id="id2880148"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>1.XRef Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
- <fo:block>2.Section Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="stchap"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest1"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2740899"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2740930"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741185"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741216"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 XRef Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Section Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="stchap"><fo:page-number-citation ref-id="stchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest1"><fo:page-number-citation ref-id="secttest1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758689"><fo:page-number-citation ref-id="id2758689"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758719"><fo:page-number-citation ref-id="id2758719"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758975"><fo:page-number-citation ref-id="id2758975"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="12pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759006"><fo:page-number-citation ref-id="id2759006"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest2"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741414"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741468"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741523"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741577"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest2"><fo:page-number-citation ref-id="secttest2"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2757634"><fo:page-number-citation ref-id="id2757634"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763732"><fo:page-number-citation ref-id="id2763732"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763786"><fo:page-number-citation ref-id="id2763786"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="12pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763841"><fo:page-number-citation ref-id="id2763841"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest3"/></fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="secttest4"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest3"><fo:page-number-citation ref-id="secttest3"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="secttest4"><fo:page-number-citation ref-id="secttest4"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 Inline Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763400"><fo:page-number-citation ref-id="id2763400"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4 Block Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2881489"><fo:page-number-citation ref-id="id2881489"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">5 List Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2883071"><fo:page-number-citation ref-id="id2883071"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>3.Inline Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741253"/></fo:block>
- <fo:block>4.Block Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2864385"/></fo:block>
- <fo:block>5.List Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2865968"/></fo:block>
- <fo:block>6.Table Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2869546"/></fo:block>
- <fo:block>7.Index Term Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2875583"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>Index Term Sect 1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2875654"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>Index Term Sect 2<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2875956"/></fo:block>
- <fo:block>Index Term Sect 3<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2876099"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">6 Table Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2886649"><fo:page-number-citation ref-id="id2886649"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">7 Index Term Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2892686"><fo:page-number-citation ref-id="id2892686"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2892757"><fo:page-number-citation ref-id="id2892757"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 2</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2893059"><fo:page-number-citation ref-id="id2893059"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index Term Sect 3</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2893202"><fo:page-number-citation ref-id="id2893202"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>II.Part Two Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="part"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">II Part Two Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="part"><fo:page-number-citation ref-id="part"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>8.CmdSynopsis Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2876151"/></fo:block>
- <fo:block>9.FuncSynopsis Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2876908"/></fo:block>
- <fo:block>10.Callout Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2877207"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">8 CmdSynopsis Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2893254"><fo:page-number-citation ref-id="id2893254"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">9 FuncSynopsis Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2894011"><fo:page-number-citation ref-id="id2894011"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">10 Callout Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2894310"><fo:page-number-citation ref-id="id2894310"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">III A Reference Part</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2894866"><fo:page-number-citation ref-id="id2894866"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>III.A Reference Part<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2877763"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>I.Reference<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="reference"/></fo:block>
- <fo:block start-indent="2pc">RefEntryTitleRefDescriptorRefName1RefName2Yes, there must be a purpose! A
- Synopsis
- Goes
- HereA RefSect1Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.A RefSect2Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.A RefSect3Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.This is a footnote in a refentry.
-Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing whitespaceDescription Returns the argument string without trailing whitespace.
- <fo:block>2.chop() example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878039"/></fo:block>
- </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">I Reference</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="reference"><fo:page-number-citation ref-id="reference"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> RefEntryTitle</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2894904"><fo:page-number-citation ref-id="id2894904"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">Chop</fo:inline></fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895088"><fo:page-number-citation ref-id="id2895088"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A A Very Short Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="appendix"><fo:page-number-citation ref-id="appendix"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">B A Very Long Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895208"><fo:page-number-citation ref-id="id2895208"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A.A Very Short Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="appendix"/></fo:block>
- <fo:block>B.A Very Long Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878105"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>a sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878756"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878795"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878826"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878856"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>a sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878887"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895859"><fo:page-number-citation ref-id="id2895859"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895898"><fo:page-number-citation ref-id="id2895898"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895929"><fo:page-number-citation ref-id="id2895929"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895959"><fo:page-number-citation ref-id="id2895959"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> a sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895990"><fo:page-number-citation ref-id="id2895990"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878926"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect2 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878980"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect3 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2879035"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect4 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2879098"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>another sect5 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2879152"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896029"><fo:page-number-citation ref-id="id2896029"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect2 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896083"><fo:page-number-citation ref-id="id2896083"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="6pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect3 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896138"><fo:page-number-citation ref-id="id2896138"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="8pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect4 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896201"><fo:page-number-citation ref-id="id2896201"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="10pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect5 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896256"><fo:page-number-citation ref-id="id2896256"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2879215"/></fo:block>
- <fo:block>another sect1 title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2879248"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896318"><fo:page-number-citation ref-id="id2896318"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> another sect1 title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2896351"><fo:page-number-citation ref-id="id2896351"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> A Test Bibliography</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="bib1"><fo:page-number-citation ref-id="bib1"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Example Glossary</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="gloss"><fo:page-number-citation ref-id="gloss"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="index"><fo:page-number-citation ref-id="index"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> An Index with a Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2898400"><fo:page-number-citation ref-id="id2898400"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A Test Bibliography<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="bib1"/></fo:block>
- <fo:block>Example Glossary<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="gloss"/></fo:block>
- <fo:block>Index<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="index"/></fo:block>
- <fo:block>An Index with a Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2881297"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -251,7 +386,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Figures</fo:block>
</fo:block>
- <fo:block>4.0.A Figure<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="figure"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 A Figure</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="figure"><fo:page-number-citation ref-id="figure"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -261,8 +399,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Tables</fo:block>
</fo:block>
- <fo:block>4.0.A Table<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="table"/></fo:block>
- <fo:block>6.0.Table Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="t1"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 A Table</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="table"><fo:page-number-citation ref-id="table"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">6.0 Table Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="t1"><fo:page-number-citation ref-id="t1"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -272,8 +416,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Examples</fo:block>
</fo:block>
- <fo:block>4.0.An Example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="example"/></fo:block>
- <fo:block>2.chop() example<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2878039"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 An Example</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="example"><fo:page-number-citation ref-id="example"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 chop() example</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2895142"><fo:page-number-citation ref-id="id2895142"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -283,11 +433,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Equations</fo:block>
</fo:block>
- <fo:block>4.0.An Equation<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="equation"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4.0 An Equation</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="equation"><fo:page-number-citation ref-id="equation"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742168" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2767785" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -296,7 +449,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.Chopstrip trailing
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This test book is dedicated to all the testers. This is the first para
@@ -305,7 +458,7 @@ of the dedication.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the dedication.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742200" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2854003" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -314,7 +467,7 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Preface Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Preface Title</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Preface content.</fo:block>
@@ -322,7 +475,7 @@ of the dedication.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the preface.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742240" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2880148" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -331,18 +484,18 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>I. Part One Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Part One Title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Partintro content<fo:footnote><fo:inline>[1]</fo:inline><fo:footnote-body font-size="8pt"><fo:block>[1] This is a footnote in a partintro.</fo:block></fo:footnote-body></fo:footnote>.</fo:block>
- <fo:block id="id2750683">
+ <fo:block id="id2853939">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">PartIntro Section</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -353,7 +506,7 @@ of the dedication.</fo:block>
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. XRef Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -364,95 +517,93 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. XRef Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Xrefs</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Xrefs</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="book">
- <fo:inline font-style="italic">Book Title</fo:inline>
- </fo:basic-link>
+ <fo:basic-link internal-destination="book">Book Title</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="part">Part II.</fo:basic-link>
+ <fo:basic-link internal-destination="part">Part II. Part Two Title</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="chapter">Chapter 1., <fo:inline font-style="italic">XRef Tests</fo:inline></fo:basic-link>
+ <fo:basic-link internal-destination="chapter">Chapter 1. XRef Tests</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="appendix">Appendix A.</fo:basic-link>
+ <fo:basic-link internal-destination="appendix">Appendix A. A Very Short Appendix</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="table">Table 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="table">Table 4.0. A Table</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="figure">Figure 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="figure">Figure 4.0. A Figure</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="example">Example 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="example">Example 4.0. An Example</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="equation">Equation 4.0.</fo:basic-link>
+ <fo:basic-link internal-destination="equation"></fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="reference">Reference I.</fo:basic-link>
+ <fo:basic-link internal-destination="reference">Reference</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="bib1">&#x201C;A Test Bibliography&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="bib1">A Test Bibliography</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="gloss">&#x201C;Example Glossary&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="gloss">Example Glossary</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="index">&#x201C;Index&#x201D;</fo:basic-link>
+ <fo:basic-link internal-destination="index">Index</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -460,10 +611,10 @@ of the dedication.</fo:block>
</fo:table>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first reference to <fo:inline font-style="italic">XML</fo:inline>.
This is the second reference to XML.
-These are references without linkend
+These are references without <fo:inline font-family="Courier">linkend</fo:inline>
attributes: <fo:inline font-style="italic">XML</fo:inline>, XML.</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Links</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">More <fo:basic-link external-destination="http://www.jclark.com/dsssl/">DSSSL information</fo:basic-link> [http://www.jclark.com/dsssl/]
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Links</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">More <fo:basic-link external-destination="http://www.jclark.com/dsssl/">DSSSL information</fo:basic-link><fo:inline hyphenate="false"> [http://www.jclark.com/dsssl/]</fo:inline>
is available.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">There is <fo:basic-link internal-destination="part">a second part</fo:basic-link> in this book.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the <fo:basic-link internal-destination="chapter"/>
@@ -473,7 +624,7 @@ chapter.</fo:block>
<fo:page-sequence id="stchap" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Section Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Section Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -484,7 +635,7 @@ chapter.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. Section Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. Section Tests</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-before="0.5em" margin-left="-4pc" font-style="italic" font-size="14.4pt" font-weight="bold" font-family="Helvetica">Section Tests Subtitle</fo:block>
</fo:block>
@@ -494,18 +645,18 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2746429"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2746445"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2758078"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2758093"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2746461"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2746484"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2758109"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2758133"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2746500"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2746531"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2758148"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2758180"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2746547"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2746570"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2746594"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2758195"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2758219"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2758242"><!--dp2--></fo:wrapper></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -527,8 +678,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest1">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -538,20 +689,20 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2746702"><!--ep1, ep1es1, ep1es1et1--></fo:wrapper>
-<fo:wrapper id="id2746733"><!--ep1, ep1es2--></fo:wrapper>
-<fo:wrapper id="id2746756"><!--ep2--></fo:wrapper>
+<fo:wrapper id="id2758350"><!--ep1, ep1es1, ep1es1et1--></fo:wrapper>
+<fo:wrapper id="id2758381"><!--ep1, ep1es2--></fo:wrapper>
+<fo:wrapper id="id2758405"><!--ep2--></fo:wrapper>
-<fo:wrapper id="id2746772"><!--fp1, fp1fs1--></fo:wrapper>
-<fo:wrapper id="id2746796"><!--fp1, fp1fs2, fp1fs2ft1--></fo:wrapper>
-<fo:wrapper id="id2746827"><!--fp2--></fo:wrapper>
+<fo:wrapper id="id2758421"><!--fp1, fp1fs1--></fo:wrapper>
+<fo:wrapper id="id2758444"><!--fp1, fp1fs2, fp1fs2ft1--></fo:wrapper>
+<fo:wrapper id="id2758476"><!--fp2--></fo:wrapper>
-<fo:wrapper id="id2746843"><!--gp1, gp1gs1--></fo:wrapper>
-<fo:wrapper id="id2746866"><!--gp1, gp1gs2--></fo:wrapper>
-<fo:wrapper id="id2746264"><!--gp1, gp1gs2, gp1gs2gt1--></fo:wrapper>
-<fo:wrapper id="id2740780"><!--gp1, gp1gs2, gp1gs2gt2--></fo:wrapper>
-<fo:wrapper id="id2740811"><!--gp1, gp1gs3--></fo:wrapper>
-<fo:wrapper id="id2740835"><!--gp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2758491"><!--gp1, gp1gs1--></fo:wrapper>
+<fo:wrapper id="id2758515"><!--gp1, gp1gs2--></fo:wrapper>
+<fo:wrapper id="id2758538"><!--gp1, gp1gs2, gp1gs2gt1--></fo:wrapper>
+<fo:wrapper id="id2758570"><!--gp1, gp1gs2, gp1gs2gt2--></fo:wrapper>
+<fo:wrapper id="id2758601"><!--gp1, gp1gs3--></fo:wrapper>
+<fo:wrapper id="id2758625"><!--gp2--></fo:wrapper></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -570,11 +721,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2740899">
+ <fo:block id="id2758689">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -584,11 +735,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2740930">
+ <fo:block id="id2758719">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -598,21 +749,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2740959"><!--hp1, hp1hs1, hp1hs1ht1--></fo:wrapper>
-<fo:wrapper id="id2740990"><!--hp1, hp1hs1, hp1hs1ht2--></fo:wrapper>
-<fo:wrapper id="id2741021"><!--hp2--></fo:wrapper>
+<fo:wrapper id="id2758748"><!--hp1, hp1hs1, hp1hs1ht1--></fo:wrapper>
+<fo:wrapper id="id2758780"><!--hp1, hp1hs1, hp1hs1ht2--></fo:wrapper>
+<fo:wrapper id="id2758811"><!--hp2--></fo:wrapper>
-<fo:wrapper id="id2741037"><!--ip1--></fo:wrapper>
-<fo:wrapper id="id2741053"><!--ip1, ip1is1--></fo:wrapper>
-<fo:wrapper id="id2741076"><!--ip1, ip1is1, ip1is1it1--></fo:wrapper>
-<fo:wrapper id="id2741108"><!--ip1, ip1is1, ip1is1it2--></fo:wrapper>
-<fo:wrapper id="id2741139"><!--ip1, ip1is2, ip1is2it1--></fo:wrapper>
-<fo:wrapper id="id2741170"><!--ip2--></fo:wrapper></fo:block>
- <fo:block id="id2741185">
+<fo:wrapper id="id2758827"><!--ip1--></fo:wrapper>
+<fo:wrapper id="id2758842"><!--ip1, ip1is1--></fo:wrapper>
+<fo:wrapper id="id2758866"><!--ip1, ip1is1, ip1is1it1--></fo:wrapper>
+<fo:wrapper id="id2758897"><!--ip1, ip1is1, ip1is1it2--></fo:wrapper>
+<fo:wrapper id="id2758929"><!--ip1, ip1is2, ip1is2it1--></fo:wrapper>
+<fo:wrapper id="id2758960"><!--ip2--></fo:wrapper></fo:block>
+ <fo:block id="id2758975">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -622,11 +773,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741216">
+ <fo:block id="id2759006">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -644,8 +795,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest2">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect1 subtitle</fo:block>
@@ -656,15 +807,15 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<fo:wrapper id="id2741321"><!--jp1--></fo:wrapper>
-<fo:wrapper id="id2741336"><!--jp1, jp1js1, jp1js1jt1--></fo:wrapper>
-<fo:wrapper id="id2741368"><!--jp1, jp1js1, jp1js1jt2--></fo:wrapper>
-<fo:wrapper id="id2741399"><!--jp2--></fo:wrapper></fo:block>
- <fo:block id="id2741414">
+<fo:wrapper id="id2757541"><!--jp1--></fo:wrapper>
+<fo:wrapper id="id2757556"><!--jp1, jp1js1, jp1js1jt1--></fo:wrapper>
+<fo:wrapper id="id2757588"><!--jp1, jp1js1, jp1js1jt2--></fo:wrapper>
+<fo:wrapper id="id2757619"><!--jp2--></fo:wrapper></fo:block>
+ <fo:block id="id2757634">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect2 subtitle</fo:block>
@@ -675,11 +826,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741468">
+ <fo:block id="id2763732">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect3 subtitle</fo:block>
@@ -690,11 +841,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741523">
+ <fo:block id="id2763786">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect4 subtitle</fo:block>
@@ -705,11 +856,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2741577">
+ <fo:block id="id2763841">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect5 subtitle</fo:block>
@@ -728,8 +879,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest3">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -743,8 +894,8 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:block id="secttest4">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -757,10 +908,10 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2741253" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2763400" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. Inline Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Inline Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -771,14 +922,14 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 3. Inline Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 3. Inline Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2741741">
+ <fo:block id="id2759086">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Testing `Quotes' in a title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Testing &#x2018;Quotes&#x2019; in a title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -795,7 +946,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUIIcon</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block>SGMLTag (Attribute)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (Attribute)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -806,7 +957,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUILabel</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">SGMLTag</fo:inline> (AttValue)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (AttValue)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -817,7 +968,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUIMenu</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">SGMLTag</fo:inline> (Element)</fo:block>
+ <fo:block><fo:inline font-family="Courier">SGMLTag</fo:inline> (Element)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -828,7 +979,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>GUISubMenu</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;/SGMLTag&gt;</fo:inline> (EndTag)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;/SGMLTag&gt;</fo:inline> (EndTag)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -839,7 +990,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>Hardware</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&amp;SGMLTag;</fo:inline> (GenEntity)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&amp;SGMLTag;</fo:inline> (GenEntity)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -849,12 +1000,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-cell>
<fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&amp;#SGMLTag;</fo:inline> (NumCharRef)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&amp;#SGMLTag;</fo:inline> (NumCharRef)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -867,20 +1018,20 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>Interface</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">%SGMLTag;</fo:inline> (ParamEntity)</fo:block>
+ <fo:block><fo:inline font-family="Courier">%SGMLTag;</fo:inline> (ParamEntity)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">ClassName</fo:inline>
+ <fo:inline font-family="Courier">ClassName</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>InterfaceDefinition</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;?SGMLTag&gt;</fo:inline> (PI)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;?SGMLTag&gt;</fo:inline> (PI)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -895,7 +1046,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;!--SGMLTag--&gt;</fo:inline> (SGMLComment)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;!--SGMLTag--&gt;</fo:inline> (SGMLComment)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -906,13 +1057,13 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:block>KeyCode</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block><fo:inline font-family="monospace">&lt;SGMLTag&gt;</fo:inline> (StartTag)</fo:block>
+ <fo:block><fo:inline font-family="Courier">&lt;SGMLTag&gt;</fo:inline> (StartTag)</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">ComputerOutput</fo:inline>
+ <fo:inline font-family="Courier">ComputerOutput</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -920,7 +1071,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">SGMLTag</fo:inline>
+ <fo:inline font-family="Courier">SGMLTag</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -933,7 +1084,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">StructField</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">StructField</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -943,7 +1094,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Literal</fo:inline>
+ <fo:inline font-family="Courier">Literal</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -966,7 +1117,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">&lt;Email&gt;</fo:inline>
+ <fo:inline font-family="Courier">&lt;Email&gt;</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -996,12 +1147,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">EnVar</fo:inline>
+ <fo:inline font-family="Courier">EnVar</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Option</fo:inline>
+ <fo:inline font-family="Courier">Option</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1022,12 +1173,12 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Filename</fo:inline>
+ <fo:inline font-family="Courier">Filename</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">Parameter</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">Parameter</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1055,19 +1206,19 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Prompt</fo:inline>
+ <fo:inline font-family="Courier">Prompt</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-weight="bold" font-family="monospace">UserInput</fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier">UserInput</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline font-family="monospace">Function</fo:inline>
+ <fo:inline font-family="Courier">Function</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1096,7 +1247,7 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline font-style="italic" font-family="monospace">Replaceable</fo:inline>
+ <fo:inline font-style="italic" font-family="Courier">Replaceable</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -1118,15 +1269,15 @@ Another footnote<fo:inline>[2]</fo:inline>.</fo:block>
</fo:table>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">And here are a couple of index terms, as another test (of
index terms, not inlines).
-<fo:wrapper id="id2864336"><!--aap1--></fo:wrapper>
-<fo:wrapper id="id2864359"><!--bbp1--></fo:wrapper></fo:block>
+<fo:wrapper id="id2881440"><!--aap1--></fo:wrapper>
+<fo:wrapper id="id2881463"><!--bbp1--></fo:wrapper></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2864385" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2881489" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">4. Block Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 4. Block Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1137,45 +1288,42 @@ index terms, not inlines).
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 4. Block Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 4. Block Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2864399">
+ <fo:block id="id2881503">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Formal Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Formal Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Example</fo:block>
- <fo:block keep-with-next.within-column="always" id="example"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Example 4.0. An Example</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Example</fo:block>
+ <fo:block id="example" 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">An Example</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is an example of a trivial example.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Figure</fo:block>
- <fo:block keep-with-next.within-column="always" id="figure"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 4.0. A Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is an example of a trivial figure.</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Figure</fo:block>
+ <fo:block id="figure" 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">A Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is an example of a trivial figure.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Equation</fo:block>
- <fo:block keep-with-next.within-column="always" id="equation"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Equation 4.0. An Equation</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Equation</fo:block>
+ <fo:block id="equation" 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">An Equation</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Table</fo:block>
- <fo:table-and-caption id="table" keep-together.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Table</fo:block>
+ <fo:table-and-caption id="table" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 4.0. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1" column-width="0.5in"/>
- <fo:table-column column-number="2" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="0.5in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -1205,28 +1353,28 @@ index terms, not inlines).
</fo:table>
</fo:table-and-caption>
</fo:block>
- <fo:block id="id2864709">
+ <fo:block id="id2881813">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Informal Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Informal Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalExample</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalExample</fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is an example of a trivial, informal example.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalEquation</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalEquation</fo:block>
<fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">InformalTable</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">InformalTable</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -1255,70 +1403,70 @@ index terms, not inlines).
</fo:table-body>
</fo:table>
</fo:block>
- <fo:block id="id2864933">
+ <fo:block id="id2882037">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Admonitions</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Admonitions</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Note</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Note</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="id2882066">
+ <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">Consider yourself noted.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2882089">
+ <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">Consider yourself noted, simply.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NoteTitle</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="id2882105">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NoteTitle</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself noted.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para, with a title.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Att</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="id2882137">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Att</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself noted, simply.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">With a title</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Important</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Important</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Important</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="id2882183">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Important</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself important.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Tip</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Tip</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Tip</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="id2882202">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Tip</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself tipped.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Warning</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Warning</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Warning</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="id2882242">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Warning</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself warned.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Caution</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Caution</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Caution</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="id2882272">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Caution</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Consider yourself cautioned.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">SimPara in Caution</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Simple Caution</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimPara in Caution</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="id2882302">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Simple Caution</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">A simpler caution.</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2865222">
+ <fo:block id="id2882326">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Other Objects</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Other Objects</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Screen</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screen</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This
is With a line-annotation
a
screen
@@ -1330,12 +1478,12 @@ This
is With a line-annotation
a
screen</fo:block>
- <fo:block font-size="16pt" font-weight="bold">ProgramListing</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ProgramListing</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This
is
a
programlisting</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Address</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Address</fo:block>
<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">Norman Walsh
ArborText, Inc.
1000 Victors Way
@@ -1345,19 +1493,19 @@ US
Voice: 313.997.0200
Fax: 313.997.0201
-Email: <fo:inline font-family="monospace">&lt;nwalsh@arbortext.com&gt;</fo:inline>
+Email: <fo:inline font-family="Courier">&lt;nwalsh@arbortext.com&gt;</fo:inline>
WWW: http://www.arbortext.com/</fo:block>
- <fo:block font-size="16pt" font-weight="bold">BlockQuote</fo:block>
- <fo:block start-indent="1in" end-indent="1in">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">BlockQuote</fo:block>
+ <fo:block start-indent="0.5in" end-indent="0.5in">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Procedure</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Procedure</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
@@ -1372,10 +1520,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second step</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>1.</fo:block>
+ <fo:block>a.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first substep</fo:block>
@@ -1383,7 +1531,7 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>2.</fo:block>
+ <fo:block>b.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second substep</fo:block>
@@ -1402,10 +1550,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Procedure With Title</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Procedure With Title</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:block font-weight="bold">Same Procedure with a Title</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
@@ -1420,10 +1568,10 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second step</fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>1.</fo:block>
+ <fo:block>a.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the first substep</fo:block>
@@ -1431,7 +1579,7 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
- <fo:block>2.</fo:block>
+ <fo:block>b.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the second substep</fo:block>
@@ -1450,24 +1598,27 @@ no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">SideBar</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SideBar</fo:block>
<fo:block>
- <fo:block font-weight="bold">What About Bob?</fo:block>
+ <fo:block font-weight="bold" keep-with-next.within-column="always" hyphenate="false">What About Bob?</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a sidebar.</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">MsgSet</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">It's not really clear how <fo:inline font-family="monospace">MsgSet</fo:inline> should be presented.
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">MsgSet</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">It's not really clear how <fo:inline font-family="Courier">MsgSet</fo:inline> should be presented.
I expect that it's fairly application, if not document, specific.</fo:block>
<fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record failed CRC</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record <fo:inline font-style="italic" font-family="monospace">n</fo:inline>
- in <fo:inline font-style="italic" font-family="monospace">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Record <fo:inline font-style="italic" font-family="Courier">n</fo:inline>
+ in <fo:inline font-style="italic" font-family="Courier">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">File read error on
+ <fo:inline font-style="italic" font-family="Courier">database</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Panic! Corrupt record!</fo:block>
</fo:block>
<fo:block>
- <fo:block><fo:inline font-weight="bold">Level: </fo:inline>severe</fo:block>
- <fo:block><fo:inline font-weight="bold">Origin: </fo:inline>server</fo:block>
- <fo:block><fo:inline font-weight="bold">Audience: </fo:inline>all</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Level: </fo:inline>severe</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Origin: </fo:inline>server</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always">Audience: </fo:inline>all</fo:block>
</fo:block>
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Indicates that some sort of error occured attempting to load
@@ -1476,7 +1627,7 @@ I expect that it's fairly application, if not document, specific.</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">LiteralLayout</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LiteralLayout</fo:block>
<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
literal
layout</fo:block>
@@ -1489,10 +1640,10 @@ literal
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2865968" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2883071" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">5. List Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 5. List Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1503,20 +1654,20 @@ literal
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 5. List Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 5. List Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2865982">
+ <fo:block id="id2883085">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">OrderedLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">OrderedLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Default Numeration</fo:block>
- <fo:list-block id="id2866011" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866016" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Default Numeration</fo:block>
+ <fo:list-block id="id2883114" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883119" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1524,17 +1675,17 @@ literal
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866032" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883135" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">this one starts with
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">this one starts with
a program listing
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866049" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883152" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1544,7 +1695,7 @@ a synopsis
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866065" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883168" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1555,18 +1706,18 @@ a synopsis
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866089" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883192" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>Three</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A
Screen
Here</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866113" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883216" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -1575,9 +1726,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Arabic Numeration</fo:block>
- <fo:list-block id="id2866149" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866146" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Arabic Numeration</fo:block>
+ <fo:list-block id="id2883252" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883249" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1585,7 +1736,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866172" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883275" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1593,7 +1744,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866187" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883290" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1601,7 +1752,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866202" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883305" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1610,9 +1761,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Arabic Numeration (Long)</fo:block>
- <fo:list-block id="id2866238" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866235" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Arabic Numeration (Long)</fo:block>
+ <fo:list-block id="id2883342" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883338" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1620,7 +1771,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866261" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883364" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1628,7 +1779,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866277" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883380" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1636,7 +1787,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866292" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883396" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1644,7 +1795,7 @@ Here</fo:block>
<fo:block>Four</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866308" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883411" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
@@ -1652,7 +1803,7 @@ Here</fo:block>
<fo:block>Five</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866324" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883427" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -1660,7 +1811,7 @@ Here</fo:block>
<fo:block>Six</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866340" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883443" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>7.</fo:block>
</fo:list-item-label>
@@ -1668,7 +1819,7 @@ Here</fo:block>
<fo:block>Seven</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866355" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883458" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>8.</fo:block>
</fo:list-item-label>
@@ -1676,7 +1827,7 @@ Here</fo:block>
<fo:block>Eight</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866371" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883474" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>9.</fo:block>
</fo:list-item-label>
@@ -1684,7 +1835,7 @@ Here</fo:block>
<fo:block>Nine</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866387" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883490" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>10.</fo:block>
</fo:list-item-label>
@@ -1692,7 +1843,7 @@ Here</fo:block>
<fo:block>Ten</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866402" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883505" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>11.</fo:block>
</fo:list-item-label>
@@ -1701,9 +1852,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">UpperAlpha Numeration</fo:block>
- <fo:list-block id="id2866438" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866435" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">UpperAlpha Numeration</fo:block>
+ <fo:list-block id="id2883542" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883538" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1711,7 +1862,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866461" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883564" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1719,7 +1870,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866477" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883580" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1727,7 +1878,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866492" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883596" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1736,9 +1887,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">LowerAlpha Numeration</fo:block>
- <fo:list-block id="id2866529" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866525" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LowerAlpha Numeration</fo:block>
+ <fo:list-block id="id2883632" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883628" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1746,7 +1897,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866551" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883654" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1754,7 +1905,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866567" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883670" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1762,7 +1913,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866583" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883686" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1771,9 +1922,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">UpperRoman Numeration</fo:block>
- <fo:list-block id="id2866619" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866616" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">UpperRoman Numeration</fo:block>
+ <fo:list-block id="id2883722" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883719" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1781,7 +1932,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866641" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883744" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1789,7 +1940,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866657" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883760" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1797,7 +1948,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866673" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883776" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1806,9 +1957,9 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">LowerRoman Numeration</fo:block>
- <fo:list-block id="id2866709" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866706" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">LowerRoman Numeration</fo:block>
+ <fo:list-block id="id2883812" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2883809" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -1816,7 +1967,7 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866732" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883835" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -1824,7 +1975,7 @@ Here</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866747" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883850" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
@@ -1832,7 +1983,7 @@ Here</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866763" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883866" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -1841,23 +1992,23 @@ Here</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Continued</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Continued</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">First list:
-<fo:list-block id="id2866800" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item id="id2866806" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>One</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866822" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Two</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866838" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Three</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866854" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Four</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
+<fo:list-block id="id2883903" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em"><fo:list-item id="id2883910" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>One</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2883925" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Two</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2883941" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Three</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2883957" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Four</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second list:
-<fo:list-block id="id2866882" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item id="id2866878" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Five</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866904" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Six</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866919" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Seven</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866935" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Eight</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866951" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>5.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Nine</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2866966" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>6.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Ten</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
+<fo:list-block id="id2883985" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em"><fo:list-item id="id2883981" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>1.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Five</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2884007" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>2.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Six</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2884022" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>3.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Seven</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2884038" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>4.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Eight</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2884054" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>5.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Nine</fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2884069" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>6.</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>Ten</fo:block></fo:list-item-body></fo:list-item></fo:list-block></fo:block>
</fo:block>
- <fo:block id="id2866984">
+ <fo:block id="id2884088">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ItemizedLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">ItemizedLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Default Presentation</fo:block>
- <fo:list-block id="id2867013" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867019" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Default Presentation</fo:block>
+ <fo:list-block id="id2884116" 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="id2884122" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1865,17 +2016,17 @@ Here</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867034" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884137" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">One-point-five. This one starts with
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">One-point-five. This one starts with
a program listing
what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884155" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1883,7 +2034,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867067" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884170" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1891,7 +2042,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867083" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884186" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1900,9 +2051,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Block Elements in a List</fo:block>
- <fo:list-block id="id2867115" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867120" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Block Elements in a List</fo:block>
+ <fo:list-block id="id2884218" 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="id2884224" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1911,7 +2062,7 @@ what happens?</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another para.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867144" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884247" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1919,7 +2070,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867160" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884263" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1927,7 +2078,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867176" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884279" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1936,9 +2087,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">Alternate Mark and OverRide</fo:block>
- <fo:list-block id="id2867212" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867209" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Alternate Mark and OverRide</fo:block>
+ <fo:list-block id="id2884315" 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="id2884312" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1946,7 +2097,7 @@ what happens?</fo:block>
<fo:block>TeX and LaTeX</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867240" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884343" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1954,7 +2105,7 @@ what happens?</fo:block>
<fo:block>Troff</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867255" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884358" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1962,7 +2113,7 @@ what happens?</fo:block>
<fo:block>Lout</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867276" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884379" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1971,9 +2122,9 @@ what happens?</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block font-size="16pt" font-weight="bold">No mark Presentation</fo:block>
- <fo:list-block id="id2867312" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867324" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">No mark Presentation</fo:block>
+ <fo:list-block id="id2884415" 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="id2884427" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1981,7 +2132,7 @@ what happens?</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867344" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884447" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1989,7 +2140,7 @@ what happens?</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867359" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884462" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1997,7 +2148,7 @@ what happens?</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867375" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884478" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2007,16 +2158,16 @@ what happens?</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2867394">
+ <fo:block id="id2884497">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">VariableLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">VariableLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2867409" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867415" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884512" 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="id2884518" 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>Term1</fo:inline>
@@ -2030,7 +2181,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867453" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884556" 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>Term2</fo:inline>
@@ -2044,7 +2195,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867491" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884594" 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>Term3</fo:inline>
@@ -2056,8 +2207,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
- <fo:list-block id="id2867525" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867531" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884628" 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="id2884634" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2065,7 +2216,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>One</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867547" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884650" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2073,7 +2224,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>Two</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867563" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884666" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2081,7 +2232,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block>Three</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867578" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884681" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2097,7 +2248,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867613" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884716" 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>Term4</fo:inline>
@@ -2112,8 +2263,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:list-block id="id2867652" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867659" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884756" 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="id2884762" 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>Another List</fo:inline>
@@ -2127,14 +2278,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867697" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884800" 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>ProgramListing</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A ProgramListing
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A ProgramListing
Is the First Element
of this VarListEntry</fo:block>
<fo:block>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -2146,18 +2297,18 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2867747">
+ <fo:block id="id2884850">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleLists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">SimpleLists</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Inline</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inline</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">An inline simple list:
<fo:inline>One, Two, Three, Four, Five, Six, Seven</fo:inline></fo:block>
- <fo:block font-size="16pt" font-weight="bold">Horiz</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Horiz</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
@@ -2195,7 +2346,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Vert</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Vert</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
@@ -2234,16 +2385,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-body>
</fo:table>
</fo:block>
- <fo:block id="id2868021">
+ <fo:block id="id2885124">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">More Complex List Item Content</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">More Complex List Item Content</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2868036" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2868042" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2885139" 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="id2885146" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2252,7 +2403,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868066" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885169" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2261,16 +2412,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868090" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885193" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Three</fo:block>
+ <fo:block>Three</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868113" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885216" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2279,16 +2430,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868137" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885240" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">Formal Element</fo:inline>Five</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">Formal Element</fo:inline>Five</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868176" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885279" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -2297,8 +2448,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:list-block id="id2868193" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2868200" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2885296" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2885303" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>1.</fo:block>
</fo:list-item-label>
@@ -2307,7 +2458,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868223" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885326" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>2.</fo:block>
</fo:list-item-label>
@@ -2316,16 +2467,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868247" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885350" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>3.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Three</fo:block>
+ <fo:block>Three</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868270" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885373" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>4.</fo:block>
</fo:list-item-label>
@@ -2334,16 +2485,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868294" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885397" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>5.</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">Formal Element</fo:inline>Five</fo:block>
+ <fo:block><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">Formal Element</fo:inline>Five</fo:block>
<fo:block>Second para</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868333" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885436" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>6.</fo:block>
</fo:list-item-label>
@@ -2353,11 +2504,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block id="id2868352">
+ <fo:block id="id2885455">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Segmented List</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Segmented List</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2465,10 +2616,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2869546" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2886649" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">6. Table Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 6. Table Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -2479,57 +2630,57 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 6. Table Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 6. Table Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Alternate Alignment on Entry</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Alternate Alignment on Entry</fo:block>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>h3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-body>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>left</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>center</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>right</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>right</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
- <fo:table-header>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-header border-top="0.5pt solid black ">
<fo:table-row>
<fo:table-cell>
<fo:block>h1</fo:block>
@@ -2542,7 +2693,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
- <fo:table-body>
+ <fo:table-body border-bottom="0.5pt solid black ">
<fo:table-row>
<fo:table-cell>
<fo:block>left</fo:block>
@@ -2568,9 +2719,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-body>
</fo:table>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -2598,14 +2749,14 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">center literal</fo:inline>
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">center literal</fo:inline>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">center filename</fo:inline>
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">center filename</fo:inline>
</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2619,11 +2770,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Absolute Widths</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Absolute Widths</fo:block>
<fo:table>
- <fo:table-column column-number="1" column-width="1in"/>
- <fo:table-column column-number="2" column-width="1in"/>
- <fo:table-column column-number="3" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="1in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="1in"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -2673,10 +2824,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Relative Widths</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Relative Widths</fo:block>
<fo:table table-layout="fixed">
- <fo:table-column column-number="1" column-width="proportional-column-width(3)"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(2)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="proportional-column-width(3)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="proportional-column-width(2)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2704,12 +2855,12 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Too many cells</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Too many cells</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a broken table. There are too many cells in the second row.
YMMV. Don't do this.</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2740,15 +2891,15 @@ YMMV. Don't do this.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">Missing Entrys</fo:block>
- <fo:table-and-caption id="t1" keep-together.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Missing Entrys</fo:block>
+ <fo:table-and-caption id="t1" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 6.0. Table Title</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">Table Title</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -2813,14 +2964,14 @@ YMMV. Don't do this.</fo:block>
</fo:table-body>
</fo:table>
</fo:table-and-caption>
- <fo:block font-size="16pt" font-weight="bold">Complex</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Complex</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
- <fo:table-column column-number="4"/>
- <fo:table-column column-number="5"/>
- <fo:table-column column-number="6"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="4"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="5"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="6"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2846,10 +2997,10 @@ YMMV. Don't do this.</fo:block>
<fo:table-cell>
<fo:block>B1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-right="0.5pt solid black " padding-right="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>B2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>B3</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2863,7 +3014,7 @@ YMMV. Don't do this.</fo:block>
<fo:table-cell>
<fo:block>C1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-right="0.5pt solid black " padding-right="2pt">
<fo:block>C2</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -2920,10 +3071,10 @@ YMMV. Don't do this.</fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">With Footnotes</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">With Footnotes</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -2945,23 +3096,23 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block font-size="16pt" font-weight="bold">A Big One</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A Big One</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
- <fo:table-column column-number="4"/>
- <fo:table-column column-number="5"/>
- <fo:table-column column-number="6"/>
- <fo:table-column column-number="7"/>
- <fo:table-column column-number="8"/>
- <fo:table-column column-number="9"/>
- <fo:table-column column-number="10"/>
- <fo:table-column column-number="11"/>
- <fo:table-column column-number="12"/>
- <fo:table-column column-number="13"/>
- <fo:table-column column-number="14"/>
- <fo:table-column column-number="15"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="4"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="5"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="6"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="7"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="8"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="9"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="10"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="11"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="12"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="13"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="14"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="15"/>
<fo:table-header>
<fo:table-row>
<fo:table-cell>
@@ -4426,10 +4577,10 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
</fo:table>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2875583" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2892686" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">7. Index Term Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 7. Index Term Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4440,7 +4591,7 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 7. Index Term Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 7. Index Term Tests</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Test data.</fo:block>
@@ -4450,11 +4601,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:wrapper id="idx2">
<!--chap-level-->
</fo:wrapper>
- <fo:block id="id2875654">
+ <fo:block id="id2892757">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4480,17 +4631,17 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:wrapper id="idx9">
<!--chap-level, sec, tert-->
</fo:wrapper>
- <fo:wrapper id="id2875900">
+ <fo:wrapper id="id2893003">
<!--chap-level, sec, tert-->
</fo:wrapper>
<fo:wrapper id="idx11">
<!--sect1-level-->
</fo:wrapper>
- <fo:block id="id2875956">
+ <fo:block id="id2893059">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 2</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 2</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4508,11 +4659,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<!--chap-level, sec, tert-->
</fo:wrapper>
</fo:block>
- <fo:block id="id2876099">
+ <fo:block id="id2893202">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 3</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Index Term Sect 3</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4525,15 +4676,15 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>II. Part Two Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Part Two Title</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2876151" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2893254" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">8. CmdSynopsis Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 8. CmdSynopsis Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4544,27 +4695,27 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 8. CmdSynopsis Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 8. CmdSynopsis Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Very Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cd</fo:inline> {<fo:inline font-style="italic" font-family="monospace">directory</fo:inline>}</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cal</fo:inline> [-j] [-y] [month [year]]</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Another Simple CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">chgrp</fo:inline> [-R
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Very Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cd</fo:inline> {<fo:inline font-style="italic" font-family="Courier">directory</fo:inline>}</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cal</fo:inline> [-j] [-y] [month [year]]</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Another Simple CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">chgrp</fo:inline> [-R
[-H | -L | -P]
- ] [-f] <fo:inline font-style="italic" font-family="monospace">group</fo:inline> <fo:inline font-style="italic" font-family="monospace">file</fo:inline>... </fo:block>
- <fo:block font-size="16pt" font-weight="bold">Slightly Complex CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">emacs</fo:inline> [-t <fo:inline font-style="italic" font-family="monospace">file</fo:inline>] [-q] [-u <fo:inline font-style="italic" font-family="monospace">user</fo:inline>] [+<fo:inline font-style="italic" font-family="monospace">number</fo:inline>] [-f <fo:inline font-style="italic" font-family="monospace">function</fo:inline>...] [-l <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] <fo:inline font-style="italic" font-family="monospace">file</fo:inline>... </fo:block>
- <fo:block font-size="16pt" font-weight="bold">Quite Complex CmdSynopsis</fo:block>
- <fo:block><fo:inline font-family="monospace">cccp</fo:inline> [-$] [-C] [-D<fo:inline font-style="italic" font-family="monospace">name</fo:inline> [=<fo:inline font-style="italic" font-family="monospace">definition</fo:inline>]...] [-dD] [-dM] [-I <fo:inline font-style="italic" font-family="monospace">directory</fo:inline>...] [-H] [-I-] [-imacros <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] [-include <fo:inline font-style="italic" font-family="monospace">file</fo:inline>...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<fo:inline font-style="italic" font-family="monospace">name</fo:inline>] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<fo:inline font-style="italic" font-family="monospace">infile</fo:inline> | -} {<fo:inline font-style="italic" font-family="monospace">outfile</fo:inline> | -}</fo:block>
+ ] [-f] <fo:inline font-style="italic" font-family="Courier">group</fo:inline> <fo:inline font-style="italic" font-family="Courier">file</fo:inline>... </fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Slightly Complex CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">emacs</fo:inline> [-t <fo:inline font-style="italic" font-family="Courier">file</fo:inline>] [-q] [-u <fo:inline font-style="italic" font-family="Courier">user</fo:inline>] [+<fo:inline font-style="italic" font-family="Courier">number</fo:inline>] [-f <fo:inline font-style="italic" font-family="Courier">function</fo:inline>...] [-l <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] <fo:inline font-style="italic" font-family="Courier">file</fo:inline>... </fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Quite Complex CmdSynopsis</fo:block>
+ <fo:block><fo:inline font-family="Courier">cccp</fo:inline> [-$] [-C] [-D<fo:inline font-style="italic" font-family="Courier">name</fo:inline> [=<fo:inline font-style="italic" font-family="Courier">definition</fo:inline>]...] [-dD] [-dM] [-I <fo:inline font-style="italic" font-family="Courier">directory</fo:inline>...] [-H] [-I-] [-imacros <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] [-include <fo:inline font-style="italic" font-family="Courier">file</fo:inline>...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<fo:inline font-style="italic" font-family="Courier">name</fo:inline>] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<fo:inline font-style="italic" font-family="Courier">infile</fo:inline> | -} {<fo:inline font-style="italic" font-family="Courier">outfile</fo:inline> | -}</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2876908" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2894011" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">9. FuncSynopsis Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 9. FuncSynopsis Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4575,33 +4726,33 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 9. FuncSynopsis Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 9. FuncSynopsis Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Two Simple Parameters</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Two Simple Parameters</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(int1, int2);int int1;int int2;</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(int1, int2);int int1;int int2;</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Variable Arguments</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Variable Arguments</fo:block>
<fo:block>
<fo:block>#include &lt;varargs.h&gt;</fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(...);</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">max</fo:inline></fo:inline>(...);</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Void</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Void</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">int <fo:inline font-weight="bold">rand</fo:inline></fo:inline>();</fo:block>
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">int <fo:inline font-weight="bold">rand</fo:inline></fo:inline>();</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Function Pointer Arguments</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Function Pointer Arguments</fo:block>
<fo:block>
- <fo:block font-family="monospace"><fo:inline font-family="monospace">void <fo:inline font-weight="bold">qsort</fo:inline></fo:inline>(dataptr, left, right, (* comp));void *dataptr[];int left;int right;int (* comp)
+ <fo:block font-family="Courier"><fo:inline font-family="Courier">void <fo:inline font-weight="bold">qsort</fo:inline></fo:inline>(dataptr, left, right, (* comp));void *dataptr[];int left;int right;int (* comp)
(void *, void *);</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2877207" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2894310" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">10. Callout Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 10. Callout Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4612,11 +4763,11 @@ number</fo:block></fo:footnote-body></fo:footnote></fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 10. Callout Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 10. Callout Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">CallOut (using AREASPEC)</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">@rem = '--*-Perl-*--
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CallOut (using AREASPEC)</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">@rem = '--*-Perl-*--
@echo off
perl.exe %_batchname %$
goto endofperl
@@ -4647,92 +4798,78 @@ while (@DIRS) {
}
exit;</fo:block>
- <fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
+ <fo:block id="id2894497">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2894506">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- </fo:block>
+ <fo:block>&#x2776;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The prologue handles embedding a Perl script in a DOS batch file.</fo:block>
+ <fo:block>The prologue handles embedding a Perl script in a DOS batch file.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894551">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">goto</fo:inline> statement, interpreted by the DOS batch
+ <fo:block>The <fo:inline font-family="Courier">goto</fo:inline> statement, interpreted by the DOS batch
file interpreter, skips over the body of the Perl script.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894594">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/3.png"/>
- </fo:block>
+ <fo:block>&#x2778;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">require</fo:inline> statement sources in external program
+ <fo:block>The <fo:inline font-family="Courier">require</fo:inline> statement sources in external program
fragments.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894622">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/4.png"/>
- </fo:block>
+ <fo:block>&#x2779;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">use</fo:inline> statement is similar, but has additional
+ <fo:block>The <fo:inline font-family="Courier">use</fo:inline> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
both a line and a column.)</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894659">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/5.png"/>
- </fo:block>
+ <fo:block>&#x277A;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a user subroutine call.</fo:block>
+ <fo:block>This is a user subroutine call.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">CallOut (using CO)</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">this is a line
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CallOut (using CO)</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">this is a line
this is another line
-there's a <fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>callout in here.
+there's a <fo:inline id="callout1">&#x2776;</fo:inline>callout in here.
and there's another on the
next line
-right here:<fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block></fo:block>
- <fo:block>
- <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
+right here:<fo:inline id="callout2">&#x2777;</fo:inline></fo:block>
+ <fo:block id="id2894724">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2894745">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- </fo:block>
+ <fo:block>&#x2776;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">First callout.</fo:block>
+ <fo:block>First callout.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Second para in first callout.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894781">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+ <fo:block>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -4741,26 +4878,23 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Third para in second callout.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
+ <fo:list-item id="id2894830">
<fo:list-item-label end-indent="label-end()">
- <fo:block>
- <fo:external-graphic src="../images/callouts/1.png"/>
- <fo:external-graphic src="../images/callouts/2.png"/>
- </fo:block>
+ <fo:block>&#x2776;&#x2777;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This paragraph describes <fo:inline font-style="italic">both</fo:inline> callouts.</fo:block>
+ <fo:block>This paragraph describes <fo:inline font-style="italic">both</fo:inline> callouts.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2877763" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2894866" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>III. A Reference Part</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Reference Part</fo:block>
</fo:block>
</fo:block>
</fo:flow>
@@ -4768,20 +4902,20 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>I. Reference</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Reference</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2894904" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
</fo:block>
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
- <fo:block font-size="20pt" font-weight="bold">What about the title?</fo:block>
+ <fo:block font-size="20pt" font-weight="bold">RefEntryTitle</fo:block>
<fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block>RefName1, <fo:block font-size="18pt" font-weight="bold">Name</fo:block>RefName2 -- Yes, there must be a purpose!</fo:block>
<fo:block>
<fo:block font-size="18pt" font-weight="bold">Synopsis (what about the title?)</fo:block>
@@ -4817,19 +4951,19 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="reference" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2895088" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
</fo:block>
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
- <fo:block font-size="20pt" font-weight="bold">What about the title?</fo:block>
- <fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block><fo:inline font-family="monospace">Chop</fo:inline> -- strip trailing whitespace</fo:block>
+ <fo:block font-size="20pt" font-weight="bold">Chop</fo:block>
+ <fo:block><fo:block font-size="18pt" font-weight="bold">Name</fo:block><fo:inline font-family="Courier">Chop</fo:inline> -- strip trailing whitespace</fo:block>
<fo:block>
<fo:block font-size="18pt" font-weight="bold">Description</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Returns the argument string without trailing whitespace.
- <fo:block keep-with-next.within-column="always" id="id2878039"/><fo:block keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt">Example 2. chop() example</fo:block><fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">$trimmed = Chop($line);</fo:block></fo:block>
+ <fo:block id="id2895142" 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">chop() example</fo:block><fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">$trimmed = Chop($line);</fo:block></fo:block>
</fo:block>
</fo:block>
</fo:flow>
@@ -4837,7 +4971,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:page-sequence id="appendix" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. A Very Short Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. A Very Short Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4848,16 +4982,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. A Very Short Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. A Very Short Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2878105" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2895208" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">B. A Very Long Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. A Very Long Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -4868,7 +5002,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix B. A Very Long Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix B. A Very Long Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -5101,11 +5235,11 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</fo:block>
- <fo:block id="id2878756">
+ <fo:block id="id2895859">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5115,11 +5249,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2878795">
+ <fo:block id="id2895898">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect2 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5129,11 +5263,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2878826">
+ <fo:block id="id2895929">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect3 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5143,11 +5277,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2878856">
+ <fo:block id="id2895959">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect4 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5157,11 +5291,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2878887">
+ <fo:block id="id2895990">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">a sect5 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5176,11 +5310,11 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2878926">
+ <fo:block id="id2896029">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect1 subtitle</fo:block>
@@ -5191,11 +5325,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2878980">
+ <fo:block id="id2896083">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect2 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect2 subtitle</fo:block>
@@ -5206,11 +5340,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2879035">
+ <fo:block id="id2896138">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect3 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect3 subtitle</fo:block>
@@ -5221,11 +5355,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2879098">
+ <fo:block id="id2896201">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect4 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect4 subtitle</fo:block>
@@ -5236,11 +5370,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
- <fo:block id="id2879152">
+ <fo:block id="id2896256">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="10pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="10pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect5 title</fo:block>
</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">a sect5 subtitle</fo:block>
@@ -5256,11 +5390,11 @@ some text. some text. some text. some text. some text. some text. some text. </f
</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2879215">
+ <fo:block id="id2896318">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5271,11 +5405,11 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </fo:block>
</fo:block>
- <fo:block id="id2879248">
+ <fo:block id="id2896351">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">another sect1 title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -5297,16 +5431,16 @@ some text. some text. some text. some text. some text. some text. some text. </f
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>A Test Bibliography</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">A Test Bibliography</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Books</fo:block>
- <fo:block id="id2879329">
+ <fo:block id="id2896432" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[AhoSethiUllman96] </fo:inline>
- <fo:inline>Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
+ <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
<fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
<fo:inline>
<fo:inline>Addison-Wesley Publishing Company. </fo:inline>
@@ -5325,7 +5459,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
</fo:block>
<fo:block>
<fo:block font-size="16pt" font-weight="bold">Periodicals</fo:block>
- <fo:block id="walsh97">
+ <fo:block id="walsh97" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Walsh97] </fo:inline>
<fo:inline>&quot;A Guide to XML&quot;. <fo:inline>Norman Walsh. </fo:inline><fo:inline>1997. </fo:inline><fo:inline>Copyright &#xA9; 1997 ArborText, Inc.. </fo:inline><fo:inline>97-108. </fo:inline></fo:inline>
<fo:inline><fo:inline font-style="italic">XML: Principles, Tools, and Techniques</fo:inline>. <fo:inline><fo:inline>O'Reilly &amp; Associates, Inc.. </fo:inline></fo:inline><fo:inline>1085-2301. </fo:inline><fo:inline>Dan Connolly. </fo:inline></fo:inline>
@@ -5338,7 +5472,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.</fo:block
<fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
<fo:inline>The World Wide Web Consortium</fo:inline>.
<fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
- <fo:block id="id2879873">
+ <fo:block id="id2896976" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[Abbrev] </fo:inline>
<fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
<fo:inline>Subtitle. </fo:inline>
@@ -5351,7 +5485,7 @@ Abstract, abstract, abstract. Abstract, abstract, abstract. </fo:block>. </fo:in
<fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>
- <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>
<fo:inline>ArtPageNums. </fo:inline>
@@ -5362,12 +5496,12 @@ AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb.
AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. </fo:block>. </fo:inline>
<fo:inline>AuthorInitials. </fo:inline>
- <fo:inline><fo:block color="red">&lt;collabname&gt;The names of some collaborators&lt;/collabname&gt;</fo:block><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:block color="red">&lt;orgdiv&gt;orgdiv&lt;/orgdiv&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>The names of some collaborators. </fo:inline><fo:inline><fo:inline>shortaffil. </fo:inline><fo:inline>jobtitle. </fo:inline><fo:inline>orgname. </fo:inline><fo:inline>orgdiv. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
USA. </fo:inline>. </fo:inline>. </fo:inline>
- <fo:inline><fo:block color="red">&lt;confdates&gt;confdates&lt;/confdates&gt;</fo:block><fo:block color="red">&lt;conftitle&gt;conftitle&lt;/conftitle&gt;</fo:block><fo:block color="red">&lt;confnum&gt;confnum&lt;/confnum&gt;</fo:block><fo:inline>Any Street
+ <fo:inline><fo:inline>confdates. </fo:inline><fo:inline>conftitle. </fo:inline><fo:inline>confnum. </fo:inline><fo:inline>Any Street
Anywhere, XX 99999
-USA. </fo:inline><fo:block color="red">&lt;confsponsor&gt;confsponsor&lt;/confsponsor&gt;</fo:block>. </fo:inline>
+USA. </fo:inline><fo:inline>confsponsor. </fo:inline>. </fo:inline>
<fo:inline>ContractNum. </fo:inline>
<fo:inline>ContractSponsor. </fo:inline>
<fo:inline>Contrib. </fo:inline>
@@ -5425,42 +5559,42 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Example Glossary</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is not a real glossary, it's just an example.</fo:block>
<fo:block font-size="16pt" font-weight="bold">E</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="xml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Extensible Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Standard Generalized
- Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
<fo:block font-size="16pt" font-weight="bold">S</fo:block>
<fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="id2897916" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>SGML</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
- <fo:block>See Standard Generalized
- Markup Language.</fo:block>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>See <fo:basic-link internal-destination="sgml">Standard Generalized
+ Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item>
- <fo:list-item-label>
+ <fo:list-item id="sgml" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label end-indent="label-end()">
<fo:block>Standard Generalized
Markup Language</fo:block>
</fo:list-item-label>
- <fo:list-item-body>
+ <fo:list-item-body start-indent="body-start()">
<fo:block>Some reasonable definition here.</fo:block>
- <fo:block>See Also Extensible Markup Language.</fo:block>
+ <fo:block>See Also <fo:basic-link internal-destination="xml">Extensible Markup Language</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -5475,14 +5609,14 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Index</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test index.</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold">a formal para</fo:inline>this is a formal paragraph.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">a formal para</fo:inline>this is a formal paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2881297" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2898400" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -5491,7 +5625,7 @@ USA. </fo:inline>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">An Index with a Title</fo:block>
</fo:block>
</fo:block>
<fo:block>
diff --git a/tests/docbook/result/fo/docbook40.fo b/tests/docbook/result/fo/docbook40.fo
index 9ccfe75a..74aa5f3f 100644
--- a/tests/docbook/result/fo/docbook40.fo
+++ b/tests/docbook/result/fo/docbook40.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599706" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>DocBook V4.0 Example Document</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">DocBook V4.0 Example Document</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
@@ -109,19 +109,25 @@ included.</fo:block>
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.Block-level Markup<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2836691"/></fo:block>
- <fo:block>2.Inline markup<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744075"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 Block-level Markup</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2853792"><fo:page-number-citation ref-id="id2853792"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Inline markup</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761135"><fo:page-number-citation ref-id="id2761135"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2836691" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2853792" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Block-level Markup</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Block-level Markup</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -132,14 +138,14 @@ included.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Block-level Markup</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Block-level Markup</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">There's a new simple-alternative for <fo:inline font-family="monospace">msgentry</fo:inline>:
-<fo:inline font-family="monospace">simplemsgentry</fo:inline>.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">There's a new simple-alternative for <fo:inline font-family="Courier">msgentry</fo:inline>:
+<fo:inline font-family="Courier">simplemsgentry</fo:inline>.</fo:block>
<fo:block color="red">&lt;simplemsgentry&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The text of a message</fo:block><fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">An explanation of the message.</fo:block></fo:block>&lt;/simplemsgentry&gt;</fo:block>
<fo:block color="red">&lt;simplemsgentry&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The text of a message</fo:block><fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">An explanation of the message.</fo:block></fo:block>&lt;/simplemsgentry&gt;</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Longer descriptions are possible in a <fo:inline font-family="monospace">revhistory</fo:inline>:
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Longer descriptions are possible in a <fo:inline font-family="Courier">revhistory</fo:inline>:
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:block color="red">&lt;revhistory&gt;<fo:block color="red">&lt;revision&gt;<fo:block color="red">&lt;revnumber&gt;2&lt;/revnumber&gt;</fo:block><fo:block color="red">&lt;date&gt;today&lt;/date&gt;</fo:block><fo:block color="red">&lt;authorinitials&gt;nwalsh&lt;/authorinitials&gt;</fo:block><fo:block color="red">&lt;revdescription&gt;
@@ -154,8 +160,8 @@ included.</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Ordered and itemized lists can have titles:</fo:block>
<fo:block font-size="12pt" font-weight="bold">Itemized List</fo:block>
- <fo:list-block id="id2741843" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2741853" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2758901" 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="id2758912" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -163,7 +169,7 @@ included.</fo:block>
<fo:block>First thing</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2745553" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2762659" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -171,7 +177,7 @@ included.</fo:block>
<fo:block>Second thing</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2745564" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2762670" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -181,8 +187,8 @@ included.</fo:block>
</fo:list-item>
</fo:list-block>
<fo:block font-size="12pt" font-weight="bold">Ordered List</fo:block>
- <fo:list-block id="id2745576" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2745588" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2762682" 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="id2762693" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -190,7 +196,7 @@ included.</fo:block>
<fo:block>First thing</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2745598" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2762704" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -198,7 +204,7 @@ included.</fo:block>
<fo:block>Second thing</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2745609" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2762714" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -208,21 +214,21 @@ included.</fo:block>
</fo:list-item>
</fo:list-block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Linespecific environments can indicate line numbering:</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!ENTITY % linespecific.attrib
&quot;format NOTATION
(linespecific) 'linespecific'
linenumbering (numbered|unnumbered) #IMPLIED&quot;&gt;
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Added <fo:inline font-family="monospace">classsynopsis</fo:inline> for documenting
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Added <fo:inline font-family="Courier">classsynopsis</fo:inline> for documenting
object-oriented programming language classes. Here's one example:</fo:block>
- <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block><fo:inline font-family="monospace">TextFileWriter</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="monospace">HandlerBase</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;private&lt;/modifier&gt;</fo:block>Writer<fo:inline font-family="monospace">writer</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>String<fo:inline font-family="monospace">writerName</fo:inline><fo:block color="red">&lt;initializer&gt;&quot;MyWriter&quot;&lt;/initializer&gt;</fo:block>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;<fo:block color="red">&lt;modifier&gt;static&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>();<fo:inline font-family="monospace">write</fo:inline><fo:block color="red">&lt;methodparam&gt;ResultTreeFragment<fo:inline font-style="italic" font-family="monospace">frag</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;String<fo:inline font-style="italic" font-family="monospace">file</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="monospace">SAXException</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
+ <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block><fo:inline font-family="Courier">TextFileWriter</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">HandlerBase</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;private&lt;/modifier&gt;</fo:block>Writer<fo:inline font-family="Courier">writer</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>String<fo:inline font-family="Courier">writerName</fo:inline><fo:block color="red">&lt;initializer&gt;&quot;MyWriter&quot;&lt;/initializer&gt;</fo:block>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;<fo:block color="red">&lt;modifier&gt;static&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>();<fo:inline font-family="Courier">write</fo:inline><fo:block color="red">&lt;methodparam&gt;ResultTreeFragment<fo:inline font-style="italic" font-family="Courier">frag</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;String<fo:inline font-style="italic" font-family="Courier">file</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="Courier">SAXException</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2744075" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2761135" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Inline markup</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Inline markup</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -233,15 +239,15 @@ object-oriented programming language classes. Here's one example:</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. Inline markup</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. Inline markup</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="monospace">sgmltag</fo:inline> element has new
-class attribute values:
-<fo:inline font-family="monospace">xmlpi</fo:inline> and
-<fo:inline font-family="monospace">emptytag</fo:inline>. These produce
-processing instructions
-and empty-tag markup
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">The <fo:inline font-family="Courier">sgmltag</fo:inline> element has new
+<fo:inline font-family="Courier">class</fo:inline> attribute values:
+<fo:inline font-family="Courier">xmlpi</fo:inline> and
+<fo:inline font-family="Courier">emptytag</fo:inline>. These produce
+<fo:inline font-family="Courier">&lt;?processing instructions?&gt;</fo:inline>
+and <fo:inline font-family="Courier">&lt;empty-tag/&gt;</fo:inline> markup
suitable for XML.
</fo:block>
</fo:flow>
diff --git a/tests/docbook/result/fo/external.fo b/tests/docbook/result/fo/external.fo
index 2484e09c..d4d32251 100644
--- a/tests/docbook/result/fo/external.fo
+++ b/tests/docbook/result/fo/external.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2739239" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2756089" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Main document</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Main document</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,19 +97,25 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="main"/></fo:block>
- <fo:block>2.Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="subdoc"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 </fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="main"><fo:page-number-citation ref-id="main"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 </fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="subdoc"><fo:page-number-citation ref-id="subdoc"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="main" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. </fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -125,7 +131,7 @@
<fo:page-sequence id="subdoc" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. </fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
diff --git a/tests/docbook/result/fo/figtest.fo b/tests/docbook/result/fo/figtest.fo
index 1176467b..2bd27521 100644
--- a/tests/docbook/result/fo/figtest.fo
+++ b/tests/docbook/result/fo/figtest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599688" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,43 +89,40 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Test Document Title</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig1"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 1. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig1" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig1">Figure 1.</fo:basic-link>.
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig1">Figure 1. Test Figure</fo:basic-link>.
</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig2"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 2. Test Figure2</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">A Second
+ <fo:block id="testfig2" 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">Test Figure2</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">A Second
Test Figure
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an <fo:basic-link internal-destination="testfig2">link</fo:basic-link> to a
-figure. And an xref: <fo:basic-link internal-destination="testfig2">Figure 2.</fo:basic-link>.
+figure. And an xref: <fo:basic-link internal-destination="testfig2">Figure 2. Test Figure2</fo:basic-link>.
</fo:block>
- <fo:block keep-with-next.within-column="always" id="testfig3"/>
- <fo:block keep-with-previous.within-column="always">
- <fo:block font-weight="bold" font-size="12pt">Figure 3. Test Figure</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This is a
+ <fo:block id="testfig3" 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">Test Figure</fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
ProgramListing
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig3">Figure 3.</fo:basic-link>.
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an xref to a figure: <fo:basic-link internal-destination="testfig3">Figure 3. Test Figure</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
diff --git a/tests/docbook/result/fo/foottest.fo b/tests/docbook/result/fo/foottest.fo
index 599cdd89..a1eb3fb0 100644
--- a/tests/docbook/result/fo/foottest.fo
+++ b/tests/docbook/result/fo/foottest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599688" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,11 +89,11 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">nwalshNorman WalshOther CreditEdited bySomeother EditorSomeone Else</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 1999 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Apr. 26, 1999</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block>
@@ -108,9 +108,9 @@ This article is just a test. This article is just a test.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a footnote<fo:footnote><fo:inline>[1]</fo:inline><fo:footnote-body font-size="8pt"><fo:block>[1] See?</fo:block></fo:footnote-body></fo:footnote>.</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
- <fo:table-column column-number="3"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -171,8 +171,8 @@ This article is just a test. This article is just a test.
</fo:table-row>
</fo:table-body>
</fo:table>
- <fo:block id="id2740637">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix A. Appendix</fo:block>
+ <fo:block id="id2757771">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
</fo:block>
</fo:flow>
diff --git a/tests/docbook/result/fo/fotest.fo b/tests/docbook/result/fo/fotest.fo
index 1f020deb..1b0a4959 100644
--- a/tests/docbook/result/fo/fotest.fo
+++ b/tests/docbook/result/fo/fotest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2787253" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -93,7 +93,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
@@ -104,13 +104,22 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787306"/></fo:block>
- <fo:block>1.First Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2749479"/></fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744292"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762485"><fo:page-number-citation ref-id="id2762485"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 First Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804471"><fo:page-number-citation ref-id="id2804471"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760662"><fo:page-number-citation ref-id="id2760662"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -120,11 +129,14 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">List of Tables</fo:block>
</fo:block>
- <fo:block>1.A Table<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="table"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 A Table</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="table"><fo:page-number-citation ref-id="table"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787306" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2762485" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -133,17 +145,17 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
- <fo:table-and-caption id="table" keep-together.within-column="always">
+ <fo:table-and-caption id="table" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1" column-width="0.5in"/>
- <fo:table-column column-number="2" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="0.5in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="0.5in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -174,10 +186,10 @@
</fo:table-and-caption>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2749479" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2804471" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. First Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. First Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -188,17 +200,17 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. First Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. First Chapter</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-before="0.5em" margin-left="-4pc" font-style="italic" font-size="14.4pt" font-weight="bold" font-family="Helvetica">Chapter Subtitle</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2744292" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2760662" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -209,7 +221,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
diff --git a/tests/docbook/result/fo/func.fo b/tests/docbook/result/fo/func.fo
index 61bbdc73..0337ae02 100644
--- a/tests/docbook/result/fo/func.fo
+++ b/tests/docbook/result/fo/func.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -84,7 +84,7 @@
<fo:page-sequence id="ch1" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -95,20 +95,20 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. test</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-This is a <fo:inline font-family="monospace">foo<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">y</fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="monospace">x</fo:inline>.
+This is a <fo:inline font-family="Courier">foo<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">y</fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="Courier">x</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-This is a <fo:inline font-family="monospace">bar<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">y<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">z</fo:inline></fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="monospace">x</fo:inline>.
+This is a <fo:inline font-family="Courier">bar<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">y<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">z</fo:inline></fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="Courier">x</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-This is a <fo:inline font-family="monospace">bar<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">z</fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="monospace">x</fo:inline>.
+This is a <fo:inline font-family="Courier">bar<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">x</fo:inline><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">z</fo:inline></fo:inline>. This is just a <fo:inline font-style="italic" font-family="Courier">x</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-This is a just a function <fo:inline font-family="monospace">bar</fo:inline>.
+This is a just a function <fo:inline font-family="Courier">bar</fo:inline>.
</fo:block>
</fo:flow>
</fo:page-sequence>
diff --git a/tests/docbook/result/fo/gdp-handbook.fo b/tests/docbook/result/fo/gdp-handbook.fo
index 1d84a43f..5ad99fe6 100644
--- a/tests/docbook/result/fo/gdp-handbook.fo
+++ b/tests/docbook/result/fo/gdp-handbook.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -89,20 +89,20 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>The GNOME Handbook of Writing Software Documentation</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">The GNOME Handbook of Writing Software Documentation</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">David MasonRed Hat, Inc.<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
- <fo:inline font-family="monospace">&lt;dcm@redhat.com&gt;</fo:inline>
- </fo:block>Daniel Mueth<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
- <fo:inline font-family="monospace">&lt;d-mueth@uchicago.edu&gt;</fo:inline>
- </fo:block>Alexander Kirillov<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
- <fo:inline font-family="monospace">&lt;kirillov@math.sunysb.edu&gt;</fo:inline>
- </fo:block></fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">David Mason<fo:block><fo:block>Red Hat, Inc.</fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;dcm@redhat.com&gt;</fo:inline>
+ </fo:block></fo:block>Daniel Mueth<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;d-mueth@uchicago.edu&gt;</fo:inline>
+ </fo:block></fo:block>Alexander Kirillov<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;kirillov@math.sunysb.edu&gt;</fo:inline>
+ </fo:block></fo:block></fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
This is a pre-release!
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 2000 by Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">Copyright &#xA9; 2000 Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
@@ -112,7 +112,7 @@
by the Free Software Foundation with no Invariant Sections, no
Front-Cover Texts, and no Back-Cover Texts. You may obtain a copy
of the <fo:inline font-style="italic">GNU Free Documentation License</fo:inline> from
- the Free Software Foundation by visiting <fo:basic-link external-destination="http://www.fsf.org">their Web site</fo:basic-link> [http://www.fsf.org] or by writing to:
+ the Free Software Foundation by visiting <fo:basic-link external-destination="http://www.fsf.org">their Web site</fo:basic-link><fo:inline hyphenate="false"> [http://www.fsf.org]</fo:inline> or by writing to:
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
</fo:block>
@@ -158,24 +158,24 @@
<fo:block id="intro">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Introduction</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Introduction</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="gdp">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Project</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Project</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="goals">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Goals</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Goals</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -192,13 +192,13 @@
applications and components which are installed. The GDP is
responsible for writing numerous GNOME-related documents,
both for developers and for users. Developer documentation
- includes <fo:basic-link external-destination="http://developer.gnome.org/doc/API/">APIs for the GNOME libraries</fo:basic-link> [http://developer.gnome.org/doc/API/], <fo:basic-link external-destination="http://developer.gnome.org/doc/whitepapers/"><fo:inline font-style="italic">GNOME White
- Papers</fo:inline></fo:basic-link> [http://developer.gnome.org/doc/whitepapers/], GNOME developer <fo:basic-link external-destination="http://developer.gnome.org/doc/tutorials/">tutorials</fo:basic-link> [http://developer.gnome.org/doc/tutorials/], the <fo:basic-link external-destination="http://developer.gnome.org/doc/FAQ/"><fo:inline font-style="italic">GNOME Developer
- FAQ</fo:inline></fo:basic-link> [http://developer.gnome.org/doc/FAQ/], the <fo:basic-link external-destination="http://developer.gnome.org">GNOME
- Developer's Website</fo:basic-link> [http://developer.gnome.org], and <fo:inline font-style="italic">GNOME
+ includes <fo:basic-link external-destination="http://developer.gnome.org/doc/API/">APIs for the GNOME libraries</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/API/]</fo:inline>, <fo:basic-link external-destination="http://developer.gnome.org/doc/whitepapers/"><fo:inline font-style="italic">GNOME White
+ Papers</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/whitepapers/]</fo:inline>, GNOME developer <fo:basic-link external-destination="http://developer.gnome.org/doc/tutorials/">tutorials</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/tutorials/]</fo:inline>, the <fo:basic-link external-destination="http://developer.gnome.org/doc/FAQ/"><fo:inline font-style="italic">GNOME Developer
+ FAQ</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/FAQ/]</fo:inline>, the <fo:basic-link external-destination="http://developer.gnome.org">GNOME
+ Developer's Website</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org]</fo:inline>, and <fo:inline font-style="italic">GNOME
Handbook</fo:inline>'s, such as the one you are reading.
User documentation include the <fo:basic-link external-destination="http://www.gnome.org/learn/"><fo:inline font-style="italic">GNOME User's
- Guide</fo:inline></fo:basic-link> [http://www.gnome.org/learn/], the <fo:basic-link external-destination="http://www.gnome.org/learn/"><fo:inline font-style="italic">GNOME FAQ</fo:inline></fo:basic-link> [http://www.gnome.org/learn/], and
+ Guide</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/learn/]</fo:inline>, the <fo:basic-link external-destination="http://www.gnome.org/learn/"><fo:inline font-style="italic">GNOME FAQ</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/learn/]</fo:inline>, and
GNOME application documentation. Most GNOME applications
have their own manual in addition to context sensitive help.
</fo:block>
@@ -206,8 +206,8 @@
<fo:block id="joining">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Joining the GDP</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Joining the GDP</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -217,7 +217,7 @@
to help write, update, and edit documentation. If you are
interested in joining the GDP team, you should join the
<fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
- <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/].
+ <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>.
Read <fo:basic-link internal-destination="gettingstarted">the section called &#x201C;Getting Started Writing GNOME Documentation&#x201D;</fo:basic-link>, for help selecting a
project to work on. Feel free to introduce yourself on the
gnome-doc-list mailing list and indicate which project you
@@ -227,14 +227,14 @@
and discuss any questions you may have. For a list of GDP
projects and members, see the
<fo:basic-link external-destination="http://developer.gnome.org/projects/gdp">
- <fo:inline font-style="italic">GDP Website</fo:inline></fo:basic-link> [http://developer.gnome.org/projects/gdp].
+ <fo:inline font-style="italic">GDP Website</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp]</fo:inline>.
</fo:block>
</fo:block>
<fo:block id="collaborating">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Collaborating with the GDP</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Collaborating with the GDP</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -248,7 +248,7 @@
their applications are encouraged to find a GDP member to
write the documentation. This is best done by sending an
email to the <fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
- <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]
+ <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>
describing the application, where it can be downloaded from,
and that the developer(s) would like a GDP member to write
documentation for the application. The #docs IRC channel on
@@ -259,29 +259,29 @@
<fo:block id="notation">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Notation and Conventions</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Notation and Conventions</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This Handbook uses the following notation:
- <fo:table><fo:table-column column-number="1"/><fo:table-column column-number="2"/><fo:table-body><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">/usr/bin</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
+ <fo:table><fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/><fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/><fo:table-body><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">/usr/bin</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
Directory
- </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">foo.sgml</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
+ </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">foo.sgml</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
Filename
</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">command</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
Command or text that would be typed.
- </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">replaceable</fo:inline></fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
+ </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">replaceable</fo:inline></fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>
&quot;Variable&quot; text that can be replaced.
- </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">Program or Doc Code</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>Program or document code</fo:block></fo:table-cell></fo:table-row></fo:table-body></fo:table>
+ </fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell><fo:block><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">Program or Doc Code</fo:inline></fo:block></fo:table-cell><fo:table-cell><fo:block>Program or document code</fo:block></fo:table-cell></fo:table-row></fo:table-body></fo:table>
</fo:block>
</fo:block>
<fo:block id="about">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">About This Handbook</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">About This Handbook</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -296,32 +296,32 @@
SGML, HTML, PostScript, and PDF. For the latest version, see
<fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/handbook.html">
<fo:inline font-style="italic">Getting The GNOME Handbook of Writing Software
- Documentation</fo:inline> </fo:basic-link> [http://developer.gnome.org/projects/gdp/handbook.html]. Alternately, one may
- download it anonymously from GNOME CVS under <fo:inline font-family="monospace">gnome-docu/gdp</fo:inline>.
+ Documentation</fo:inline> </fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/handbook.html]</fo:inline>. Alternately, one may
+ download it anonymously from GNOME CVS under <fo:inline font-family="Courier">gnome-docu/gdp</fo:inline>.
</fo:block>
</fo:block>
</fo:block>
<fo:block id="gettingstarted">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Getting Started Writing GNOME Documentation</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Getting Started Writing GNOME Documentation</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="selecting">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Selecting A Document</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Selecting A Document</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="know">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Document Something You Know</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Document Something You Know</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -347,20 +347,20 @@
in the documentation, or you think that you can explain the
material more clearly, just send your suggestions to the
author of the original documentation or to the GNOME
- documentation project at <fo:inline font-family="monospace">&lt;docs@gnome.org&gt;</fo:inline>.
+ documentation project at <fo:inline font-family="Courier">&lt;docs@gnome.org&gt;</fo:inline>.
</fo:block>
</fo:block>
<fo:block id="doctable">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Status Table</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Status Table</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The <fo:inline font-style="italic">GDP Documentation Status Table</fo:inline>
- (<fo:inline font-style="italic">DocTable</fo:inline>) (<fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">http://www.gnome.org/gdp/doctable/</fo:basic-link> [http://www.gnome.org/gdp/doctable/]) is a
+ (<fo:inline font-style="italic">DocTable</fo:inline>) (<fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">http://www.gnome.org/gdp/doctable/</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/gdp/doctable/]</fo:inline>) is a
web page which tracks the status of all the various
documentation components of GNOME. These components include
application documentation, internal GNOME component
@@ -382,8 +382,8 @@
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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2758011">
+ <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
<fo:inline font-style="italic">DocTable</fo:inline> may not always be up-to-date
@@ -397,8 +397,8 @@
<fo:block id="docbook">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Installing and Using DocBook</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Installing and Using DocBook</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -409,14 +409,14 @@
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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTE</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="id2758097">
+ <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
out and learn DocBook - if you feel it is too much to handle
for now, you can submit plain ASCII text to the <fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
<fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline>
- </fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]and a volunteer will mark it up for you. Seeing your
+ </fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>and a volunteer will mark it up for you. Seeing your
document marked up will also be a great way for you to start
learning DocBook.
</fo:block>
@@ -424,18 +424,18 @@
<fo:block id="installingdocbook">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Installing DocBook</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Installing DocBook</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- Download and install the following <fo:basic-link external-destination="ftp://sourceware.cygnus.com:/pub/docbook-tools/">DocBook Tools packages</fo:basic-link> [ftp://sourceware.cygnus.com:/pub/docbook-tools/]: jade, docbook,
+ Download and install the following <fo:basic-link external-destination="ftp://sourceware.cygnus.com:/pub/docbook-tools/">DocBook Tools packages</fo:basic-link><fo:inline hyphenate="false"> [ftp://sourceware.cygnus.com:/pub/docbook-tools/]</fo:inline>: jade, docbook,
jadetex, sgml-common, and stylesheets. (RPM users should note
that jade is platform dependent (eg. i386), while the other packages
- are in the <fo:inline font-family="monospace">noarch</fo:inline>
+ are in the <fo:inline font-family="Courier">noarch</fo:inline>
directory.) You can find more
- information on DocBook Tools <fo:basic-link external-destination=" http://sourceware.cygnus.com/docbook-tools/">here</fo:basic-link> [ http://sourceware.cygnus.com/docbook-tools/].
+ information on DocBook Tools <fo:basic-link external-destination=" http://sourceware.cygnus.com/docbook-tools/">here</fo:basic-link><fo:inline hyphenate="false"> [ http://sourceware.cygnus.com/docbook-tools/]</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
If you are an Emacs user you may
@@ -446,30 +446,30 @@
<fo:block id="gdpstylesheets">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Stylesheets</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Stylesheets</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The GDP uses its own DocBook stylesheets. To use the GDP
stylesheets, you should download the file
- <fo:inline font-family="monospace">gdp-both.dsl</fo:inline> from the <fo:inline font-family="monospace">gnome-docu/gdp/dsssl</fo:inline> module in
+ <fo:inline font-family="Courier">gdp-both.dsl</fo:inline> from the <fo:inline font-family="Courier">gnome-docu/gdp/dsssl</fo:inline> module in
CVS (or from <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/stylesheets.html">
- GDP Custom DSSSL Stylesheet</fo:basic-link> [http://developer.gnome.org/projects/gdp/stylesheets.html])and copy it
+ GDP Custom DSSSL Stylesheet</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/stylesheets.html]</fo:inline>)and copy it
over the file
- <fo:inline font-family="monospace">/usr/lib/sgml/stylesheets/cygnus-both.dsl</fo:inline>.
+ <fo:inline font-family="Courier">/usr/lib/sgml/stylesheets/cygnus-both.dsl</fo:inline>.
Alternately, you can download and install the
- <fo:basic-link external-destination="http://people.redhat.com/dcm/software.html">gnome-doc-tools package</fo:basic-link> [http://people.redhat.com/dcm/software.html] which will set
+ <fo:basic-link external-destination="http://people.redhat.com/dcm/software.html">gnome-doc-tools package</fo:basic-link><fo:inline hyphenate="false"> [http://people.redhat.com/dcm/software.html]</fo:inline> which will set
up the stylesheets as well as the DTD discussed below.
</fo:block>
</fo:block>
<fo:block id="gdpdtd">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP DTD (PNG Image Support)</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP DTD (PNG Image Support)</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -477,7 +477,7 @@
Due to some license issues involved with the creation of
gifs, the GNOME Documentation Project has decided to use the
PNG image format for all images in GNOME documentation. You
- can read more about the issues involved with gifs at <fo:basic-link external-destination="http://www.gnu.org/philosophy/gif.html">http://www.gnu.org/philosophy/gif.html</fo:basic-link> [http://www.gnu.org/philosophy/gif.html].
+ can read more about the issues involved with gifs at <fo:basic-link external-destination="http://www.gnu.org/philosophy/gif.html">http://www.gnu.org/philosophy/gif.html</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnu.org/philosophy/gif.html]</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The current DocBook DTD(3.1) does not include support for
@@ -490,23 +490,23 @@
DTD's. To install the GDP custom DTD with PNG image support
by hand:
</fo:block>
- <fo:list-block id="id2741166" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2741177" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2758478" 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="id2758490" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
Download <fo:basic-link external-destination="http://www.labs.redhat.com/png/png-support.html">the
- GDP DocBook DTD for PNG support</fo:basic-link> [http://www.labs.redhat.com/png/png-support.html] and install it
- where you keep your DTD's. (On Red Hat use <fo:inline font-family="monospace">/usr/lib/sgml/</fo:inline>.) Note that
+ GDP DocBook DTD for PNG support</fo:basic-link><fo:inline hyphenate="false"> [http://www.labs.redhat.com/png/png-support.html]</fo:inline> and install it
+ where you keep your DTD's. (On Red Hat use <fo:inline font-family="Courier">/usr/lib/sgml/</fo:inline>.) Note that
the 3.0 DTD is missing support for the
- <fo:inline font-family="monospace">&lt;legalnotice&gt;</fo:inline> tag, so it is
+ <fo:inline font-family="Courier">&lt;legalnotice&gt;</fo:inline> tag, so it is
recommended that you use version 3.1
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2741345" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2758658" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -517,11 +517,11 @@
distribution. (On Red Hat it is usually in
/usr/lib/sgml/CATALOG.) Add the following line to this
file:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.0//EN&quot; &quot;png-support-3.0.dtd&quot;
</fo:block>
If you are using the 3.1 DTD, use:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot; &quot;png-support-3.1.dtd&quot;
</fo:block>
</fo:block>
@@ -530,7 +530,7 @@ PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot; &quot;png-support-
</fo:list-block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Alternately, you can download and install the
- <fo:basic-link external-destination="http://people.redhat.com/dcm/software.html">gnome-doc-tools package</fo:basic-link> [http://people.redhat.com/dcm/software.html] which will set
+ <fo:basic-link external-destination="http://people.redhat.com/dcm/software.html">gnome-doc-tools package</fo:basic-link><fo:inline hyphenate="false"> [http://people.redhat.com/dcm/software.html]</fo:inline> which will set
up the custom stylesheets and DTD for you.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
@@ -540,14 +540,14 @@ PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot; &quot;png-support-
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Articles:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!DOCTYPE Article PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant
V1.1//EN&quot;[]&gt;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Books:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!DOCTYPE Book PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant
V1.1//EN&quot;[]&gt;
</fo:block>
@@ -556,8 +556,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="editors">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Editors</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Editors</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -583,8 +583,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="make-output">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Creating Something Useful with your Docs</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Creating Something Useful with your Docs</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -599,29 +599,29 @@ V1.1//EN&quot;[]&gt;
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To preview your DocBook document, it is easiest to convert
- it to <fo:inline font-family="monospace">html</fo:inline>. If you have installed the
+ it to <fo:inline font-family="Courier">html</fo:inline>. If you have installed the
DocBook tools described above, all you have to do is to run
- the command <fo:inline font-family="monospace">$</fo:inline><fo:inline font-weight="bold">db2html
+ the command <fo:inline font-family="Courier">$</fo:inline><fo:inline font-weight="bold">db2html
mydocument.sgml</fo:inline>. If there are no sgml syntax
- errors, this will create a directory <fo:inline font-family="monospace">mydocument</fo:inline> and place the
+ errors, this will create a directory <fo:inline font-family="Courier">mydocument</fo:inline> and place the
resulting html files in it. The title page of the document
will typically be
- <fo:inline font-family="monospace">mydocument/index.html</fo:inline>. If you have
+ <fo:inline font-family="Courier">mydocument/index.html</fo:inline>. If you have
screenshots in your document, you will have to copy these
- files into the <fo:inline font-family="monospace">mydocument</fo:inline> directory by
+ files into the <fo:inline font-family="Courier">mydocument</fo:inline> directory by
hand. You can use any web browser to view your document.
Note that every time you run <fo:inline font-weight="bold">db2html</fo:inline>, it
- creates the <fo:inline font-family="monospace">mydocument</fo:inline> directory over, so
+ creates the <fo:inline font-family="Courier">mydocument</fo:inline> directory over, so
you will have to copy the screenshots over each time.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
You can also convert your document to PostScript by running
- the command <fo:inline font-family="monospace">$</fo:inline><fo:inline font-weight="bold">db2ps
+ the command <fo:inline font-family="Courier">$</fo:inline><fo:inline font-weight="bold">db2ps
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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTE</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="id2758565">
+ <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
documentation distributed with GNOME unless you have the
@@ -635,8 +635,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="jadeimages">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Images in DocBook Tools</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Images in DocBook Tools</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -656,7 +656,7 @@ V1.1//EN&quot;[]&gt;
include the extension of the image file, since DocBook
Tools will automatically insert it for you. For example:
</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;figure&gt;
&lt;title&gt;My Image&lt;/title&gt;
@@ -669,10 +669,10 @@ V1.1//EN&quot;[]&gt;
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
You will notice in this example that the file
- <fo:inline font-family="monospace">myfile.png</fo:inline> was referred to as simply
- <fo:inline font-family="monospace">myfile</fo:inline>. Now when you run
+ <fo:inline font-family="Courier">myfile.png</fo:inline> was referred to as simply
+ <fo:inline font-family="Courier">myfile</fo:inline>. Now when you run
<fo:inline font-weight="bold">db2html</fo:inline> to create an html file, it will
- automatically look for <fo:inline font-family="monospace">myfile.png</fo:inline> in
+ automatically look for <fo:inline font-family="Courier">myfile.png</fo:inline> in
the directory.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
@@ -680,7 +680,7 @@ V1.1//EN&quot;[]&gt;
EPS version of your image file to be displayed in the
PostScript file. There is a simple script available which
allows you to change a PNG image into an EPS file
- easily. You can download this file - img2eps - from <fo:basic-link external-destination="http://people.redhat.com/dcm/sgml.html">http://people.redhat.com/dcm/sgml.html</fo:basic-link> [http://people.redhat.com/dcm/sgml.html]
+ easily. You can download this file - img2eps - from <fo:basic-link external-destination="http://people.redhat.com/dcm/sgml.html">http://people.redhat.com/dcm/sgml.html</fo:basic-link><fo:inline hyphenate="false"> [http://people.redhat.com/dcm/sgml.html]</fo:inline>
(look for the img2eps section). Note that this script is
included in the gnome-doc-tools package, so if you are using
this package, you should already have
@@ -690,8 +690,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="moredocbookinfo">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Learning DocBook</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Learning DocBook</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -700,14 +700,14 @@ V1.1//EN&quot;[]&gt;
The following resources on the web are useful for learning
DocBook:
</fo:block>
- <fo:list-block id="id2863474" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2863472" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2880601" 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="id2880598" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:basic-link external-destination="http://www.docbook.org">http://www.docbook.org</fo:basic-link> [http://www.docbook.org] - Norman
+ <fo:basic-link external-destination="http://www.docbook.org">http://www.docbook.org</fo:basic-link><fo:inline hyphenate="false"> [http://www.docbook.org]</fo:inline> - Norman
Walsh's <fo:inline font-style="italic">DocBook: The Definitive
Guide</fo:inline>. Online O'Reilly book on using
DocBook. Contains an excellent element reference. May be
@@ -715,34 +715,34 @@ V1.1//EN&quot;[]&gt;
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863527" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2880653" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:basic-link external-destination="http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html">A Practical Introduction to DocBook</fo:basic-link> [http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html]
+ <fo:basic-link external-destination="http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html">A Practical Introduction to DocBook</fo:basic-link><fo:inline hyphenate="false"> [http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html]</fo:inline>
- The Open Source Writers Group's introduction to using
DocBook. This is an excellent HOW-TO type article on
getting started.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863567" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2880694" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
<fo:basic-link external-destination="http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html">Getting Going with DocBook: Notes for
- Hackers</fo:basic-link> [http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html] - Mark Galassi's introduction to DocBook
+ Hackers</fo:basic-link><fo:inline hyphenate="false"> [http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html]</fo:inline> - 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.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863607" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2880733" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -750,7 +750,7 @@ V1.1//EN&quot;[]&gt;
<fo:block>
<fo:basic-link external-destination="http://www.freebsd.org/tutorials/docproj-primer/">
FreeBSD Documentation Project Primer for New
- Contributors</fo:basic-link> [http://www.freebsd.org/tutorials/docproj-primer/] - FreeBSD documentation project
+ Contributors</fo:basic-link><fo:inline hyphenate="false"> [http://www.freebsd.org/tutorials/docproj-primer/]</fo:inline> - FreeBSD documentation project
primer. Chapter 4.2 provides a very good introduction to
writing documentation using DocBook. Note that it also
describes some custom extensions of DocBook;
@@ -766,8 +766,8 @@ V1.1//EN&quot;[]&gt;
The following sections of this document are designed to help
documentation authors write correct and consistent DocBook:
</fo:block>
- <fo:list-block id="id2863676" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2863673" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2880802" 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="id2880800" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -789,17 +789,17 @@ V1.1//EN&quot;[]&gt;
<fo:block id="gdptemplates">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Document Templates</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Document Templates</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Templates for various types of GNOME documents are found in
- <fo:basic-link internal-destination="templates">Appendix A.</fo:basic-link>. They are kept in CVS in
+ <fo:basic-link internal-destination="templates">Appendix A. Document Templates</fo:basic-link>. They are kept in CVS in
gnome-docu/gdp/templates. The easiest source to get them from
is probably the <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/templates.html">GDP
- Document Templates</fo:basic-link> [http://developer.gnome.org/projects/gdp/templates.html] web page, which is typically kept
+ Document Templates</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/templates.html]</fo:inline> web page, which is typically kept
completely up-to-date with CVS and has a basic description of
each file from CVS.
</fo:block>
@@ -807,8 +807,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="screenshots">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshots</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshots</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -824,8 +824,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="screenshotappearance">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Appearance</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Appearance</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -847,7 +847,7 @@ V1.1//EN&quot;[]&gt;
screenshots in this form, you should create screenshots as
you wish them to appear and send them to the
<fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
- <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]
+ <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline> </fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>
requesting a GDP member reproduce these screenshots in the
correct format and email them to you.
</fo:block>
@@ -855,8 +855,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="screenshottools">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Tools</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Tools</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -886,8 +886,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="screenshotfiles">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Files</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Screenshot Files</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -913,8 +913,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="applicationbugs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Bugs</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Bugs</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -936,8 +936,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="cvs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Using CVS</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Using CVS</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -959,8 +959,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="anonymouscvs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Anonymous CVS</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Anonymous CVS</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -982,8 +982,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="logincvs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Login CVS</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Login CVS</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -992,35 +992,35 @@ V1.1//EN&quot;[]&gt;
modifications to CVS. Be sure to read the following section
on CVS etiquette before making any commits to CVS. To log in
to the CVS server as user
- <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">username</fo:inline></fo:inline> with a
+ <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">username</fo:inline></fo:inline> with a
password, you must first set your CVSROOT shell variable with
<fo:inline font-weight="bold"> export
- CVSROOT=':pserver:<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">username</fo:inline>@cvs.gnome.org:/cvs/gnome'</fo:inline>.
+ CVSROOT=':pserver:<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">username</fo:inline>@cvs.gnome.org:/cvs/gnome'</fo:inline>.
Log in with <fo:inline font-weight="bold">cvs login</fo:inline> and enter your
password. You may check out and update modules as described
above for anonymous CVS access. As a login CVS user, you may
also check modified versions of a file into the CVS server.
To check
- <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">filename</fo:inline></fo:inline> into
+ <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">filename</fo:inline></fo:inline> into
the CVS server, type <fo:inline font-weight="bold">cvs -z3 commit
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">filename</fo:inline></fo:inline>. You will be
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">filename</fo:inline></fo:inline>. You will be
given a vi editor window to type in a brief log entry,
summarizing your changes. The default editor can be changed
- using the <fo:inline font-family="monospace">EDITOR</fo:inline> environment variable or
- with the <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">-e</fo:inline></fo:inline> option. You
+ using the <fo:inline font-family="Courier">EDITOR</fo:inline> environment variable or
+ with the <fo:inline font-weight="bold"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">-e</fo:inline></fo:inline> option. You
may also check in any modifications to files in the working
directory and subdirectories using <fo:inline font-weight="bold">cvs -z3
commit</fo:inline>. To
add a new file to the CVS server, use <fo:inline font-weight="bold">cvs -z3 add
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">filename</fo:inline></fo:inline>, followed by the
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">filename</fo:inline></fo:inline>, followed by the
commit command.
</fo:block>
</fo:block>
<fo:block id="cvsetiquette">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CVS Etiquette</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">CVS Etiquette</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1034,7 +1034,7 @@ V1.1//EN&quot;[]&gt;
leader knows who is modifying the files and generally, what
sort of changes/development is being done. Also, whenever a
CVS user commits a file to CVS, they should make an entry in
- the CVS log and in the <fo:inline font-family="monospace">ChangeLog</fo:inline> so
+ the CVS log and in the <fo:inline font-family="Courier">ChangeLog</fo:inline> so
that other users know who is making modifications and what
is being modified. When modifying files created by others,
you should follow the indentation scheme used by the initial
@@ -1046,16 +1046,16 @@ V1.1//EN&quot;[]&gt;
<fo:block id="gnomedocsystem">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation System</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation System</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="gnomehelpbrowser">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Help Browser</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Help Browser</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1079,8 +1079,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="gnomehelpbrowser2">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Help Browser (GNOME-2.0)</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Help Browser (GNOME-2.0)</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1107,8 +1107,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="gnomehelponthefly">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Dynamic Document Synthesis(GNOME-2.0)</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Dynamic Document Synthesis(GNOME-2.0)</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1130,16 +1130,16 @@ V1.1//EN&quot;[]&gt;
<fo:block id="gnomehelpcomponents">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Components</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME Documentation Components</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="applicationmanualsintro">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Manuals</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Manuals</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1155,8 +1155,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="applicationhelpintro">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Help</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Help</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1165,7 +1165,7 @@ V1.1//EN&quot;[]&gt;
button on screens on which users may need help. These
Help buttons should pull up the
default help browser, determined by the
- <fo:inline font-family="monospace">ghelp</fo:inline> URL Handler (configured using the
+ <fo:inline font-family="Courier">ghelp</fo:inline> URL Handler (configured using the
Control Center), typically the
GNOME Help Browser. The help
browser should show either the first page of the application
@@ -1176,8 +1176,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="contextsensitivehelpintro">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Context Sensitive Help (coming in
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Context Sensitive Help (coming in
GNOME-2.0)</fo:block>
</fo:block>
</fo:block>
@@ -1196,8 +1196,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="userguide">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME User Guide</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">The GNOME User Guide</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1215,8 +1215,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="userdocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">User Documents</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">User Documents</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1232,8 +1232,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="developerdocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Developer Documents</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Developer Documents</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1246,14 +1246,14 @@ V1.1//EN&quot;[]&gt;
API documentation is also available for the GNOME libraries. This is
detailed documentation of the code that is used to build GNOME
apps. You can keep up with the GNOME API docs on the <fo:basic-link external-destination="http://developer.gnome.org/doc/API/">GNOME API
- Reference</fo:basic-link> [http://developer.gnome.org/doc/API/] page.
+ Reference</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/API/]</fo:inline> page.
</fo:block>
</fo:block>
<fo:block id="projectdocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Project Documents</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Project Documents</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1269,16 +1269,16 @@ V1.1//EN&quot;[]&gt;
<fo:block id="docbookbasics">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">DocBook Basics </fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">DocBook Basics </fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="introtodocbook">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Introduction to DocBook</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Introduction to DocBook</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1291,8 +1291,8 @@ V1.1//EN&quot;[]&gt;
<fo:inline font-style="italic">elements</fo:inline> which are contained between
brackets, &lt; and &gt;. Text is marked by both beginning and
ending elements, for example in the DocBook DTD, one denotes a
- title with <fo:inline font-family="monospace">&lt;title&gt;</fo:inline>The
- Title<fo:inline font-family="monospace">&lt;/title&gt;</fo:inline>.
+ title with <fo:inline font-family="Courier">&lt;title&gt;</fo:inline>The
+ Title<fo:inline font-family="Courier">&lt;/title&gt;</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The DTD (in the case of the GDP, DocBook) defines rules for how the
@@ -1358,8 +1358,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="xml">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">XML and SGML</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">XML and SGML</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1373,8 +1373,8 @@ V1.1//EN&quot;[]&gt;
advised</fo:inline> that the documentation writers conform to XML
syntax rules. Here are most important differences:
</fo:block>
- <fo:list-block id="id2865958" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2865964" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2883085" 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="id2883092" 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>
@@ -1385,8 +1385,8 @@ V1.1//EN&quot;[]&gt;
It is possible with some implementations of SGML to use
minimizations to close elements in a document by using
&lt;/&gt;, for example:
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">&lt;title&gt;</fo:inline>The
- Title<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">&lt;/&gt;</fo:inline></fo:inline>. This is not
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">&lt;title&gt;</fo:inline>The
+ Title<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">&lt;/&gt;</fo:inline></fo:inline>. This is not
allowed in XML. You can use <fo:inline font-weight="bold">sgmlnorm</fo:inline> command,
included in DocBook Tools package, to expand minimized tags;
if you are using Emacs with psgml
@@ -1395,7 +1395,7 @@ V1.1//EN&quot;[]&gt;
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866066" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883193" 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>
@@ -1405,17 +1405,17 @@ V1.1//EN&quot;[]&gt;
<fo:block>
Also, in SGML some tags are allowed not to have closing
tags. For example, it is legal for
- <fo:inline font-family="monospace">&lt;xref&gt;</fo:inline> not to have a closing tag:
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">&lt;xref
+ <fo:inline font-family="Courier">&lt;xref&gt;</fo:inline> not to have a closing tag:
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">&lt;xref
linkend=&quot;someid&quot;&gt;</fo:inline></fo:inline>. In
XML, it is illegal; instead, you should use
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">&lt;xref
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">&lt;xref
linkend=&quot;someid&quot;/&gt;</fo:inline></fo:inline> (note the
slash!).
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866138" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883266" 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>
@@ -1424,11 +1424,11 @@ V1.1//EN&quot;[]&gt;
<fo:list-item-body start-indent="body-start()">
<fo:block>
In XML, unlike SGML, tags are case-senstive
- <fo:inline font-family="monospace">&lt;title&gt;</fo:inline> and
- <fo:inline font-family="monospace">&lt;TITLE&gt;</fo:inline> are different tags!
+ <fo:inline font-family="Courier">&lt;title&gt;</fo:inline> and
+ <fo:inline font-family="Courier">&lt;TITLE&gt;</fo:inline> are different tags!
Therefore, please always use lowercase tags (except for
- things like <fo:inline font-family="monospace">DOCTYPE, CDATA</fo:inline> and
- <fo:inline font-family="monospace">ENTITY</fo:inline>, which are not DocBook tags).
+ things like <fo:inline font-family="Courier">DOCTYPE, CDATA</fo:inline> and
+ <fo:inline font-family="Courier">ENTITY</fo:inline>, which are not DocBook tags).
</fo:block>
</fo:list-item-body>
</fo:list-item>
@@ -1437,37 +1437,37 @@ V1.1//EN&quot;[]&gt;
<fo:block id="structure">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Structure Elements</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Structure Elements</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="section">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Sections and paragraphs</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Sections and paragraphs</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Top-level element of a book body must be
- <fo:inline font-family="monospace">&lt;chapter&gt;</fo:inline>; it may contain one or more
- <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline>, each of them may contain
- <fo:inline font-family="monospace">&lt;sect2&gt;</fo:inline> and so on up to
- <fo:inline font-family="monospace">&lt;sect5&gt;</fo:inline>. The top-level element of an
+ <fo:inline font-family="Courier">&lt;chapter&gt;</fo:inline>; it may contain one or more
+ <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline>, each of them may contain
+ <fo:inline font-family="Courier">&lt;sect2&gt;</fo:inline> and so on up to
+ <fo:inline font-family="Courier">&lt;sect5&gt;</fo:inline>. The top-level element of an
article body is always
- <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline>. Regardless of which elements
+ <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline>. Regardless of which elements
you use, give each structural element a unique id, so that
you can link to it. For usage example, see the template.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Please try to avoid using deeply nested sections; for
- most situations, <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline> and
- <fo:inline font-family="monospace">&lt;sect2&gt;</fo:inline> should be sufficient. If not,
- you probably should split your <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline>
+ most situations, <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline> and
+ <fo:inline font-family="Courier">&lt;sect2&gt;</fo:inline> should be sufficient. If not,
+ you probably should split your <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline>
into several smaller ones.
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Use the tag <fo:inline font-family="monospace">&lt;para&gt;</fo:inline> for
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Use the tag <fo:inline font-family="Courier">&lt;para&gt;</fo:inline> for
paragraphs, even if there is only one paragraph in a
section--see template for examples.
</fo:block>
@@ -1475,8 +1475,8 @@ V1.1//EN&quot;[]&gt;
<fo:block id="notes">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Notes, Warnings, And Tips</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Notes, Warnings, And Tips</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1484,10 +1484,10 @@ V1.1//EN&quot;[]&gt;
For notes, tips, warnings, and important information, which
should be set apart from the main text (usually as a
paragraph with some warning sign on the margin), use tags
- <fo:inline font-family="monospace">&lt;note&gt;</fo:inline>, <fo:inline font-family="monospace">&lt;tip&gt;</fo:inline>,
- <fo:inline font-family="monospace">&lt;warning&gt;</fo:inline>,
- <fo:inline font-family="monospace">&lt;important&gt;</fo:inline> respectively. For example:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;note&gt;</fo:inline>, <fo:inline font-family="Courier">&lt;tip&gt;</fo:inline>,
+ <fo:inline font-family="Courier">&lt;warning&gt;</fo:inline>,
+ <fo:inline font-family="Courier">&lt;important&gt;</fo:inline> respectively. For example:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;tip&gt;
&lt;title&gt;TIP&lt;/title&gt;
@@ -1497,8 +1497,8 @@ V1.1//EN&quot;[]&gt;
&lt;/para&gt;
&lt;/tip&gt; </fo:block> produces
</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">TIP</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="extip">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">TIP</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To speed up program compilation, use
gcc compiler with Pentium
@@ -1506,14 +1506,14 @@ V1.1//EN&quot;[]&gt;
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Note that this should not be inside a
- <fo:inline font-family="monospace">&lt;para&gt;</fo:inline> but between paragraphs.
+ <fo:inline font-family="Courier">&lt;para&gt;</fo:inline> but between paragraphs.
</fo:block>
</fo:block>
<fo:block id="figures">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Screenshots and other figures</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Screenshots and other figures</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1521,7 +1521,7 @@ V1.1//EN&quot;[]&gt;
To include screenshots and other figures, use the following
tags:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;figure id=&quot;shot1&quot;&gt;
&lt;title&gt;Screenshot&lt;/title&gt;
@@ -1532,13 +1532,13 @@ V1.1//EN&quot;[]&gt;
&lt;/screenshot&gt;
&lt;/figure&gt;
</fo:block>
- replacing <fo:inline font-family="monospace">example_screenshot</fo:inline> with the
+ replacing <fo:inline font-family="Courier">example_screenshot</fo:inline> with the
actual file name (without extension). The result will look like this:
- <fo:block keep-with-next.within-column="always" id="shot1"/><fo:block keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt">Figure 1. Screenshot</fo:block><fo:block><fo:block><fo:external-graphic src="file:figures/example_screenshot" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block></fo:block></fo:block>
+ <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">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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTE</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="id2883757">
+ <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
not include the file type extension -- to find out
@@ -1549,15 +1549,15 @@ V1.1//EN&quot;[]&gt;
<fo:block id="listing">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Program listings and terminal session</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Program listings and terminal session</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To show a file fragment--for example, program
- listing--use <fo:inline font-family="monospace">&lt;programlisting&gt;</fo:inline> tag:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ listing--use <fo:inline font-family="Courier">&lt;programlisting&gt;</fo:inline> tag:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;programlisting&gt;
[Desktop Entry]
@@ -1569,7 +1569,7 @@ Type=Application
&lt;/programlisting&gt;
</fo:block>
which produces
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
[Desktop Entry]
Name=Gnumeric spreadsheet
Exec=gnumeric
@@ -1578,13 +1578,13 @@ Terminal=0
Type=Application
</fo:block>
As a matter of fact, all examples in this document were
- produced using <fo:inline font-family="monospace">&lt;programlisting&gt;</fo:inline>.
+ produced using <fo:inline font-family="Courier">&lt;programlisting&gt;</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To show a record of terminal session--i.e., sequence of
commands entered at the command line--use
- <fo:inline font-family="monospace">&lt;screen&gt;</fo:inline> tag:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;screen&gt;</fo:inline> tag:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;screen&gt;
&lt;prompt&gt;bash$&lt;/prompt&gt;&lt;userinput&gt;make love&lt;/userinput&gt;
@@ -1592,16 +1592,16 @@ make: *** No rule to make target `love'. Stop.
&lt;/screen&gt;
</fo:block>
which produces
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
-<fo:inline font-family="monospace">bash$</fo:inline><fo:inline font-weight="bold" font-family="monospace">make love</fo:inline>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
+<fo:inline font-family="Courier">bash$</fo:inline><fo:inline font-weight="bold" font-family="Courier">make love</fo:inline>
make: *** No rule to make target `love'. Stop.
</fo:block>
- Note the use of tags <fo:inline font-family="monospace">&lt;prompt&gt;</fo:inline> and
- <fo:inline font-family="monospace">&lt;userinput&gt;</fo:inline> for marking system prompt
+ Note the use of tags <fo:inline font-family="Courier">&lt;prompt&gt;</fo:inline> and
+ <fo:inline font-family="Courier">&lt;userinput&gt;</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"><fo:block font-size="14pt" font-weight="bold" keep-with-next="true">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="monospace">&lt;programlisting&gt;</fo:inline>
- and <fo:inline font-family="monospace">&lt;screen&gt;</fo:inline> preserve linebreaks,
+ <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="id2883969"><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">&lt;programlisting&gt;</fo:inline>
+ and <fo:inline font-family="Courier">&lt;screen&gt;</fo:inline> preserve linebreaks,
but interpret SGML tags (unlike LaTeX
verbatim environment). Take a look at
the source of this document to see how you can have SGML
@@ -1612,29 +1612,29 @@ make: *** No rule to make target `love'. Stop.
<fo:block id="lists">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Lists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Lists</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The most common list types in DocBook are
- <fo:inline font-family="monospace">&lt;itemizedlist&gt;</fo:inline>,
- <fo:inline font-family="monospace">&lt;orderedlist&gt;</fo:inline>, and
- <fo:inline font-family="monospace">&lt;variablelist&gt;</fo:inline>.
+ <fo:inline font-family="Courier">&lt;itemizedlist&gt;</fo:inline>,
+ <fo:inline font-family="Courier">&lt;orderedlist&gt;</fo:inline>, and
+ <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline>.
</fo:block>
- <fo:list-block id="id2866954" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866961" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884081" 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="id2884088" 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="monospace">&lt;itemizedlist&gt;</fo:inline></fo:inline>
+ <fo:inline> <fo:inline font-family="Courier">&lt;itemizedlist&gt;</fo:inline></fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
This is the simplest unnumbered list, parallel to
- <fo:inline font-family="monospace">&lt;ul&gt;</fo:inline> in HTML. Here is an example:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;ul&gt;</fo:inline> in HTML. Here is an example:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;itemizedlist&gt;
&lt;listitem&gt;
@@ -1663,8 +1663,8 @@ make: *** No rule to make target `love'. Stop.
</fo:block>
and output:
</fo:block>
- <fo:list-block id="id2867014" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866998" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884142" 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="id2884126" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</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="id2867061" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884188" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</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="id2867088" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884215" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
@@ -1703,62 +1703,62 @@ make: *** No rule to make target `love'. Stop.
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note the use of <fo:inline font-family="monospace">&amp;mdash;</fo:inline>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note the use of <fo:inline font-family="Courier">&amp;mdash;</fo:inline>
for long dash (see <fo:basic-link internal-destination="specsymb">the section called &#x201C; Special symbols &#x201D;</fo:basic-link>). Also,
please note that the result looks much nicer because the
terms being explained (Show backup
files, etc.) are set in a different font. In
- this case, it was achieved by using <fo:basic-link internal-destination="gui"><fo:inline font-family="monospace">&lt;guilabel&gt;</fo:inline></fo:basic-link>
+ this case, it was achieved by using <fo:basic-link internal-destination="gui"><fo:inline font-family="Courier">&lt;guilabel&gt;</fo:inline></fo:basic-link>
tag. In other cases, use appropriate tags such as
- <fo:basic-link internal-destination="gui"><fo:inline font-family="monospace">&lt;guimenuitem&gt;</fo:inline></fo:basic-link>,
- <fo:basic-link internal-destination="filenames"><fo:inline font-family="monospace">&lt;command&gt;</fo:inline></fo:basic-link>,
+ <fo:basic-link internal-destination="gui"><fo:inline font-family="Courier">&lt;guimenuitem&gt;</fo:inline></fo:basic-link>,
+ <fo:basic-link internal-destination="filenames"><fo:inline font-family="Courier">&lt;command&gt;</fo:inline></fo:basic-link>,
or -- if none of
this applies -- use
- <fo:basic-link internal-destination="gui"><fo:inline font-family="monospace">&lt;emphasis&gt;</fo:inline></fo:basic-link>.
+ <fo:basic-link internal-destination="gui"><fo:inline font-family="Courier">&lt;emphasis&gt;</fo:inline></fo:basic-link>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867254" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884382" 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="monospace">&lt;orderedlist&gt;</fo:inline></fo:inline>
+ <fo:inline> <fo:inline font-family="Courier">&lt;orderedlist&gt;</fo:inline></fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
This list is completely analogous to
- <fo:inline font-family="monospace">&lt;itemizedlist&gt;</fo:inline> and has the same
+ <fo:inline font-family="Courier">&lt;itemizedlist&gt;</fo:inline> and has the same
syntax, but it produces numbered list. By default,
this list uses Arabic numerals for numbering entries;
- you can override this using <fo:inline font-family="monospace">numeration</fo:inline>,
- for example <fo:inline font-family="monospace">&lt;orderedlist
+ you can override this using <fo:inline font-family="Courier">numeration</fo:inline>,
+ for example <fo:inline font-family="Courier">&lt;orderedlist
numeration=&quot;lowerroman&quot;&gt;</fo:inline>. Possible values of
- these attribute are <fo:inline font-family="monospace">arabic</fo:inline>,
- <fo:inline font-family="monospace">upperalpha</fo:inline>,
- <fo:inline font-family="monospace">loweralpha</fo:inline>,
- <fo:inline font-family="monospace">upperroman</fo:inline>,
- <fo:inline font-family="monospace">lowerroman</fo:inline>.
+ these attribute are <fo:inline font-family="Courier">arabic</fo:inline>,
+ <fo:inline font-family="Courier">upperalpha</fo:inline>,
+ <fo:inline font-family="Courier">loweralpha</fo:inline>,
+ <fo:inline font-family="Courier">upperroman</fo:inline>,
+ <fo:inline font-family="Courier">lowerroman</fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867353" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884480" 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="monospace">&lt;variablelist&gt;</fo:inline></fo:inline>
+ <fo:inline> <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline></fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block> 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
- <fo:inline font-family="monospace">&lt;variablelist&gt;</fo:inline> is more complicated
+ <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline> is more complicated
than itemizedlists, but for larger blocks of text, or when
you're explaining or defining something, it's best to use
them. Their greatest advantage is that it's easier for a
computer to search. The lines you are reading now were
- produced by <fo:inline font-family="monospace">&lt;variablelist&gt;</fo:inline>. The
+ produced by <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline>. The
source looked liked this:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;variablelist&gt;
&lt;varlistentry&gt;
@@ -1791,93 +1791,93 @@ make: *** No rule to make target `love'. Stop.
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Lists can be nested; in this case, the stylesheets
are smart enough to change the numeration (for
- <fo:inline font-family="monospace">&lt;orderedlist&gt;</fo:inline>) or marks of each entry
- (in <fo:inline font-family="monospace">&lt;itemizedlist&gt;</fo:inline>) for sub-lists
+ <fo:inline font-family="Courier">&lt;orderedlist&gt;</fo:inline>) or marks of each entry
+ (in <fo:inline font-family="Courier">&lt;itemizedlist&gt;</fo:inline>) for sub-lists
</fo:block>
</fo:block>
</fo:block>
<fo:block id="inline">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inline Elements</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inline Elements</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="gui">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GUI elements</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GUI elements</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2867524" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867530" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884651" 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="id2884657" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;guibutton&gt;</fo:inline> -- used for
+ <fo:inline font-family="Courier">&lt;guibutton&gt;</fo:inline> -- used for
buttons, including checkbuttons and radio buttons
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867556" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884683" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;guimenu&gt;</fo:inline>,
- <fo:inline font-family="monospace">&lt;guisubmenu&gt;</fo:inline> --used for
+ <fo:inline font-family="Courier">&lt;guimenu&gt;</fo:inline>,
+ <fo:inline font-family="Courier">&lt;guisubmenu&gt;</fo:inline> --used for
top-level menus and submenus
- respectively, for example <fo:inline font-family="monospace">
+ respectively, for example <fo:inline font-family="Courier">
&lt;guisubmenu&gt;Utilities&lt;/guisubmenu&gt; submenu of the
&lt;guimenu&gt;Main Menu&lt;/guimenu&gt;</fo:inline>
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867600" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884727" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;guimenuitem&gt;</fo:inline>--an entry in a
+ <fo:inline font-family="Courier">&lt;guimenuitem&gt;</fo:inline>--an entry in a
menu
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867626" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884753" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;guiicon&gt;</fo:inline>--an icon
+ <fo:inline font-family="Courier">&lt;guiicon&gt;</fo:inline>--an icon
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867649" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884776" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;guilabel&gt;</fo:inline>--for items which have
+ <fo:inline font-family="Courier">&lt;guilabel&gt;</fo:inline>--for items which have
labels, like tabs, or bounding boxes.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867675" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884802" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;interface&gt;</fo:inline>-- for most everything
+ <fo:inline font-family="Courier">&lt;interface&gt;</fo:inline>-- for most everything
else... a window, a dialog box, the Panel, etc.
</fo:block>
</fo:list-item-body>
@@ -1888,7 +1888,7 @@ make: *** No rule to make target `love'. Stop.
Main Menu-&gt;Utilities-&gt;GNOME
terminal
there is a special construction for this, too:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;menuchoice&gt;
&lt;guimenu&gt;Main Menu&lt;/guimenu&gt; &lt;guisubmenu&gt;Utilities&lt;/guisubmenu&gt;
@@ -1899,50 +1899,50 @@ make: *** No rule to make target `love'. Stop.
<fo:block id="links">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Links and references</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Links and references</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To refer to another place in the same document, you can use
- tags <fo:inline font-family="monospace">&lt;xref&gt;</fo:inline> and
- <fo:inline font-family="monospace">&lt;link&gt;</fo:inline>. The first of them
+ tags <fo:inline font-family="Courier">&lt;xref&gt;</fo:inline> and
+ <fo:inline font-family="Courier">&lt;link&gt;</fo:inline>. The first of them
automatically inserts the full name of the element you refer
to (section, figure, etc.), while the second just creates a
link (in HTML output). Here is an example:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
An example of a &lt;link linkend=&quot;extip&quot;&gt;tip&lt;/link&gt; was given in
&lt;xref linkend=&quot;notes&quot; /&gt;.
</fo:block>
which produces: An example of a <fo:basic-link internal-destination="extip">tip</fo:basic-link> was given in <fo:basic-link internal-destination="notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</fo:basic-link>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- Here <fo:inline font-family="monospace">notes</fo:inline> and <fo:inline font-family="monospace">extip</fo:inline>
+ Here <fo:inline font-family="Courier">notes</fo:inline> and <fo:inline font-family="Courier">extip</fo:inline>
are the id attributes of <fo:basic-link internal-destination="notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</fo:basic-link> and of the
example of a tip in it.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To produce a link to an external source, such as a
- Web page or a local file, use <fo:inline font-family="monospace">&lt;ulink&gt;</fo:inline>
+ Web page or a local file, use <fo:inline font-family="Courier">&lt;ulink&gt;</fo:inline>
tag, for example:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
To find more about GNOME, please visit &lt;ulink type=&quot;http&quot;
url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</fo:block>
which produces: To find more about GNOME, please visit
<fo:basic-link external-destination="http://www.gnome.org">The GNOME Web
- Site</fo:basic-link> [http://www.gnome.org] You can use any of the standard URL types, such
- as <fo:inline font-family="monospace">http, ftp, file, telnet, mailto</fo:inline> (in
- most cases, however, use of <fo:inline font-family="monospace">mailto</fo:inline> is
+ Site</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org]</fo:inline> You can use any of the standard URL types, such
+ as <fo:inline font-family="Courier">http, ftp, file, telnet, mailto</fo:inline> (in
+ most cases, however, use of <fo:inline font-family="Courier">mailto</fo:inline> is
unnecessary--see discussion of
- <fo:inline font-family="monospace">&lt;email&gt;</fo:inline> tag).
+ <fo:inline font-family="Courier">&lt;email&gt;</fo:inline> tag).
</fo:block>
</fo:block>
<fo:block id="filenames">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Filenames, commands, and other
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Filenames, commands, and other
computer-related things</fo:block>
</fo:block>
</fo:block>
@@ -1951,88 +1951,88 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
Here are some tags used to describe operating system-related
things:
</fo:block>
- <fo:list-block id="id2868025" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2868032" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2885152" 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="id2885159" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block> <fo:inline font-family="monospace">&lt;filename&gt;</fo:inline> -- used
+ <fo:block> <fo:inline font-family="Courier">&lt;filename&gt;</fo:inline> -- used
for filenames,
- e.g.<fo:inline font-family="monospace">&lt;filename&gt;</fo:inline>
+ e.g.<fo:inline font-family="Courier">&lt;filename&gt;</fo:inline>
foo.sgml
- <fo:inline font-family="monospace">&lt;/filename&gt;</fo:inline>
- produces: <fo:inline font-family="monospace">foo.sgml</fo:inline>.
+ <fo:inline font-family="Courier">&lt;/filename&gt;</fo:inline>
+ produces: <fo:inline font-family="Courier">foo.sgml</fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868081" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885208" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block> <fo:inline font-family="monospace">&lt;filename
+ <fo:block> <fo:inline font-family="Courier">&lt;filename
class=&quot;directory&quot;&gt;</fo:inline> -- used for
- directories, e.g.<fo:inline font-family="monospace">&lt;filename
+ directories, e.g.<fo:inline font-family="Courier">&lt;filename
class=&quot;directory&quot;&gt;</fo:inline>/usr/bin
- <fo:inline font-family="monospace">&lt;/filename&gt;</fo:inline>
- produces: <fo:inline font-family="monospace">/usr/bin</fo:inline>.
+ <fo:inline font-family="Courier">&lt;/filename&gt;</fo:inline>
+ produces: <fo:inline font-family="Courier">/usr/bin</fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868137" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885265" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;application&gt;</fo:inline> -- used for
+ <fo:inline font-family="Courier">&lt;application&gt;</fo:inline> -- used for
application names,
- e.g. <fo:inline font-family="monospace">&lt;application&gt;</fo:inline>Gnumeric
- <fo:inline font-family="monospace">&lt;/application&gt;</fo:inline> produces:
+ e.g. <fo:inline font-family="Courier">&lt;application&gt;</fo:inline>Gnumeric
+ <fo:inline font-family="Courier">&lt;/application&gt;</fo:inline> produces:
Gnumeric.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868187" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885314" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;envar&gt;</fo:inline> -- used for
+ <fo:inline font-family="Courier">&lt;envar&gt;</fo:inline> -- used for
environment variables, e.g.
- <fo:inline font-family="monospace">&lt;envar&gt;</fo:inline>PATH<fo:inline font-family="monospace">&lt;/envar&gt;</fo:inline>.
+ <fo:inline font-family="Courier">&lt;envar&gt;</fo:inline>PATH<fo:inline font-family="Courier">&lt;/envar&gt;</fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868228" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885355" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;command&gt;</fo:inline> -- used for
+ <fo:inline font-family="Courier">&lt;command&gt;</fo:inline> -- used for
commands entered on command line, e.g.
- <fo:inline font-family="monospace">&lt;command&gt;</fo:inline>make install
- <fo:inline font-family="monospace">&lt;/command&gt;</fo:inline> produces:
+ <fo:inline font-family="Courier">&lt;command&gt;</fo:inline>make install
+ <fo:inline font-family="Courier">&lt;/command&gt;</fo:inline> produces:
<fo:inline font-weight="bold">make install</fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868278" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885405" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&lt;replaceable&gt;</fo:inline> -- used for
+ <fo:inline font-family="Courier">&lt;replaceable&gt;</fo:inline> -- used for
replaceable text, e.g.
- <fo:inline font-family="monospace">&lt;command&gt;</fo:inline>db2html<fo:inline font-family="monospace">&lt;replaceable&gt;</fo:inline>
+ <fo:inline font-family="Courier">&lt;command&gt;</fo:inline>db2html<fo:inline font-family="Courier">&lt;replaceable&gt;</fo:inline>
foo.sgml
- <fo:inline font-family="monospace">&lt;/replaceable&gt;</fo:inline><fo:inline font-family="monospace">&lt;/command&gt;</fo:inline>
+ <fo:inline font-family="Courier">&lt;/replaceable&gt;</fo:inline><fo:inline font-family="Courier">&lt;/command&gt;</fo:inline>
produces: <fo:inline font-weight="bold">db2html
- <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">foo.sgml</fo:inline></fo:inline>.
+ <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">foo.sgml</fo:inline></fo:inline>.
</fo:block>
</fo:list-item-body>
</fo:list-item>
@@ -2041,32 +2041,32 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="keys">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Keyboard input</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Keyboard input</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To mark up text input by the user, use
- <fo:inline font-family="monospace">&lt;userinput&gt;</fo:inline>.
+ <fo:inline font-family="Courier">&lt;userinput&gt;</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To mark keystrokes such as shortcuts and other
- commands, use <fo:inline font-family="monospace">&lt;keycap&gt;</fo:inline>.
+ commands, use <fo:inline font-family="Courier">&lt;keycap&gt;</fo:inline>.
This is used for marking up what is printed on the top
of the physical key on the keyboard. There are a couple of
- other tags for keys, too: <fo:inline font-family="monospace">&lt;keysym&gt;</fo:inline>
- and <fo:inline font-family="monospace">&lt;keycode&gt;</fo:inline>. However you are
+ other tags for keys, too: <fo:inline font-family="Courier">&lt;keysym&gt;</fo:inline>
+ and <fo:inline font-family="Courier">&lt;keycode&gt;</fo:inline>. However you are
unlikely to need these for most documentation. For reference,
- <fo:inline font-family="monospace">&lt;keysym&gt;</fo:inline> is for the `symbolic
- name' of a key. <fo:inline font-family="monospace">&lt;keycode&gt;</fo:inline> is
- for the `scan code' of a key. These are not
+ <fo:inline font-family="Courier">&lt;keysym&gt;</fo:inline> is for the &#x2018;symbolic
+ name&#x2019; of a key. <fo:inline font-family="Courier">&lt;keycode&gt;</fo:inline> is
+ for the &#x2018;scan code&#x2019; of a key. These are not
terms commonly required in GNOME documentation,
- although <fo:inline font-family="monospace">&lt;keysym&gt;</fo:inline> is useful for marking
+ although <fo:inline font-family="Courier">&lt;keysym&gt;</fo:inline> is useful for marking
up control codes.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To mark up a combination of keystrokes, use the
- <fo:inline font-family="monospace">&lt;keycombo&gt;</fo:inline> wrapper:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">&lt;keycombo&gt;</fo:inline> wrapper:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;keycombo&gt;
&lt;keycap&gt;Ctrl&lt;/keycap&gt;
@@ -2078,7 +2078,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Finally, if you want to show a shortcut for some menu
command, here are the appropriate tags (rather long):
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;menuchoice&gt;
&lt;shortcut&gt;
@@ -2094,28 +2094,28 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="email">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">E-mail addresses</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">E-mail addresses</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To mark up e-mail
- address, use <fo:inline font-family="monospace">&lt;email&gt;</fo:inline>:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ address, use <fo:inline font-family="Courier">&lt;email&gt;</fo:inline>:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
The easiest way to get in touch with me is by e-mail
(&lt;email&gt;me@mydomain.com&lt;/email&gt;)
</fo:block>
which produces: The easiest way to get in touch with me is
- by e-mail (<fo:inline font-family="monospace">&lt;me@mydomain.com&gt;</fo:inline>) Note that
- <fo:inline font-family="monospace">&lt;email&gt;</fo:inline> automatically produces a link
+ by e-mail (<fo:inline font-family="Courier">&lt;me@mydomain.com&gt;</fo:inline>) Note that
+ <fo:inline font-family="Courier">&lt;email&gt;</fo:inline> automatically produces a link
in html version.
</fo:block>
</fo:block>
<fo:block id="specsymb">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Special symbols </fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Special symbols </fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2125,60 +2125,60 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
form the keyboard (such as copyright sign). This is done using
<fo:inline font-style="italic">entities</fo:inline>, which is SGML analogue of
macros, or commands, of LaTeX. They generally have the form
- <fo:inline font-family="monospace">&amp;entityname;</fo:inline>. Note that the semicolon
+ <fo:inline font-family="Courier">&amp;entityname;</fo:inline>. Note that the semicolon
is required.
</fo:block>
<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="id2868711" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2868718" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2885838" 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="id2885845" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&amp;amp;</fo:inline> -- ampersend (&amp;)
+ <fo:inline font-family="Courier">&amp;amp;</fo:inline> -- ampersend (&amp;)
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868736" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885864" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&amp;lt;</fo:inline> -- left angle bracket (&lt;)
+ <fo:inline font-family="Courier">&amp;lt;</fo:inline> -- left angle bracket (&lt;)
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868756" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885883" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&amp;copy;</fo:inline> -- copyright sign (&#xA9;)
+ <fo:inline font-family="Courier">&amp;copy;</fo:inline> -- copyright sign (&#xA9;)
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868774" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885902" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&amp;mdash;</fo:inline> -- long dash (--)
+ <fo:inline font-family="Courier">&amp;mdash;</fo:inline> -- long dash (--)
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868793" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885921" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>
- <fo:inline font-family="monospace">&amp;hellip;</fo:inline> -- ellipsis (...)
+ <fo:inline font-family="Courier">&amp;hellip;</fo:inline> -- ellipsis (...)
</fo:block>
</fo:list-item-body>
</fo:list-item>
@@ -2186,7 +2186,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Note that the actual look of the resulting symbols depends
on the fonts used by your browser; for example, it might
- happen that long dash (<fo:inline font-family="monospace">&amp;mdash;</fo:inline>) looks
+ happen that long dash (<fo:inline font-family="Courier">&amp;mdash;</fo:inline>) looks
exactly like the usual dash (-). However, in the PostScript
(and thus, in print) the output will look markedly better if
you use appropriate tags.
@@ -2197,24 +2197,24 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="conventions">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Documentation Conventions </fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">GDP Documentation Conventions </fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="conventionsalldocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Conventions for All GDP Documentation</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Conventions for All GDP Documentation</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="xmlcomp">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> XML compatibility </fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> XML compatibility </fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2227,8 +2227,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="authorsnames">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Authors' names</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Authors' names</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2244,23 +2244,23 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="conventionsappdocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Conventions for Application Documentation</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Conventions for Application Documentation</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="applicationversionid">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Version Identification</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Version Identification</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Application documentation should identify the version of the
application for which the documentation is written:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;sect1 id=&quot;intro&quot;&gt;
&lt;title&gt;Introduction&lt;/title&gt;
@@ -2274,8 +2274,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="license">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Copyright information </fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Copyright information </fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2292,8 +2292,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="license2">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Software license</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Software license</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2306,8 +2306,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="bugtraq">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="12pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Bug reporting</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"> Bug reporting</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2322,8 +2322,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="writingapplicationmanuals">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Writing Application and Applet Manuals</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Writing Application and Applet Manuals</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2336,8 +2336,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Documentation Availability</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="id2886379">
+ <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
which is only available on the internet. All manuals and
@@ -2352,28 +2352,28 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
versions 1.x and the templates in <fo:basic-link internal-destination="template2-2x">the section called &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Manuals For Large Applications</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="id2886419">
+ <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
- components should be a <fo:inline font-family="monospace">&lt;book&gt;</fo:inline> (and thus
- use <fo:inline font-family="monospace">&lt;chapter&gt;</fo:inline> for each primary section)
- , instead of <fo:inline font-family="monospace">&lt;article&gt;</fo:inline> which most
+ components should be a <fo:inline font-family="Courier">&lt;book&gt;</fo:inline> (and thus
+ use <fo:inline font-family="Courier">&lt;chapter&gt;</fo:inline> for each primary section)
+ , instead of <fo:inline font-family="Courier">&lt;article&gt;</fo:inline> which most
applications use(with each primary section being a
- <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline>).
+ <fo:inline font-family="Courier">&lt;sect1&gt;</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Applet Manuals in GNOME 2.0</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="id2886534">
+ <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
way. The manuals for all applets are merged into a single
virtual document by Nautilus. For this reason, the header
information for applet manuals is omitted and the first
section of each applet is
- <fo:inline font-family="monospace">&lt;sect1&gt;</fo:inline>. Applet manuals will typically
+ <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline>. Applet manuals will typically
have several sections, each of which is
- <fo:inline font-family="monospace">&lt;sect2&gt;</fo:inline>.
+ <fo:inline font-family="Courier">&lt;sect2&gt;</fo:inline>.
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
@@ -2388,13 +2388,13 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<fo:block id="listingdocsinhelpmenu">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Listing Documents in the Help Menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Listing Documents in the Help Menu</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Developer Information</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="id2886652">
+ <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
generally do not need to know this material.
@@ -2405,8 +2405,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
documents will be made available to the user under the
Help menu at the top right of the
application. To do this, you must first write a
- <fo:inline font-family="monospace">topic.dat</fo:inline> file. The format for this file is:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">topic.dat</fo:inline> file. The format for this file is:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
One line for each 'topic'.
Two columns, as defined by perl -e 'split(/\s+/,$aline,2)'
@@ -2417,31 +2417,31 @@ relative to the app's help file dir.
Second column is the user-visible topic name.
</fo:block>
For example, Gnumeric's
- <fo:inline font-family="monospace">topic.dat</fo:inline> file is:
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:inline font-family="Courier">topic.dat</fo:inline> file is:
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
gnumeric.html Gnumeric manual
function-reference.html Gnumeric function reference
</fo:block>
When the application is installed, the
- <fo:inline font-family="monospace">topic.dat</fo:inline> file should be placed in the
- <fo:inline font-family="monospace">$prefix/share/gnome/help/<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">appname</fo:inline>/C/</fo:inline> directory
- where <fo:inline font-style="italic" font-family="monospace">appname</fo:inline> is replaced by the
+ <fo:inline font-family="Courier">topic.dat</fo:inline> file should be placed in the
+ <fo:inline font-family="Courier">$prefix/share/gnome/help/<fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">appname</fo:inline>/C/</fo:inline> directory
+ where <fo:inline font-style="italic" font-family="Courier">appname</fo:inline> is replaced by the
application's name. The application documentation (converted
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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2886796">
+ <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
menu items will NOT appear when the program is run.
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- The <fo:inline font-family="monospace">topic.dat</fo:inline> file is used by the GNOME
+ The <fo:inline font-family="Courier">topic.dat</fo:inline> file is used by the GNOME
menu building code to generate the Help
menu. When you define your menu:
-<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
GnomeUIInfo helpmenu[] = {
{GNOME_APP_UI_ITEM,
N_(&quot;About&quot;), N_(&quot;Info about this program&quot;),
@@ -2453,10 +2453,10 @@ GnomeUIInfo helpmenu[] = {
GNOMEUIINFO_END
};
</fo:block>
- the line specifying <fo:inline font-family="monospace">GNOMEUIINFO_HELP</fo:inline> causes
+ the line specifying <fo:inline font-family="Courier">GNOMEUIINFO_HELP</fo:inline> causes
GNOME to create a menu entry which is tied to the documentation
in the directory mentioned above. Also, all the topics in the
- <fo:inline font-family="monospace">topic.dat</fo:inline> file will get menu entries in the
+ <fo:inline font-family="Courier">topic.dat</fo:inline> file will get menu entries in the
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.
@@ -2465,13 +2465,13 @@ GnomeUIInfo helpmenu[] = {
<fo:block id="applicationhelpbuttons">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Help Buttons</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Application Help Buttons</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Developer Information</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="id2886933">
+ <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
generally do not need to know this material.
@@ -2494,7 +2494,7 @@ GnomeUIInfo helpmenu[] = {
To make the Help buttons call the correct document in the GNOME Help
Browser the developer should add code based on the following example:
</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
gchar *tmp;
tmp = gnome_help_file_find_file (&quot;module&quot;, &quot;page.html&quot;);
if (tmp) {
@@ -2502,8 +2502,8 @@ 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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTE</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="id2887039">
+ <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
documentation or forums for other GNOME language bindings.
@@ -2513,16 +2513,16 @@ if (tmp) {
<fo:block id="packagingappletdocs">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Packaging Applet Documentation</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Packaging Applet Documentation</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="appletfiles">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Applet Documentation Files</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Applet Documentation Files</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2537,7 +2537,7 @@ if (tmp) {
with the applet in CVS), but they are merged together manually
to create the <fo:inline font-style="italic">GNOME Applets</fo:inline> book before
distribution. Telsa
- <fo:inline font-family="monospace">&lt;hobbit@aloss.ukuu.org.uk&gt;</fo:inline> is the maintainer of
+ <fo:inline font-family="Courier">&lt;hobbit@aloss.ukuu.org.uk&gt;</fo:inline> is the maintainer of
this document. Applet documentation should be sent to Telsa
(or placed in CVS) who will make sure they are correctly
packaged with the applets. The applet author should be
@@ -2553,27 +2553,27 @@ if (tmp) {
Applets which are not part of the gnome-applets package must
package their documentation with the particular applet
package. They should use the same applet template as other
- applets. However, the <fo:inline font-family="monospace">&lt;xref&gt;</fo:inline> links to
+ applets. However, the <fo:inline font-family="Courier">&lt;xref&gt;</fo:inline> links to
the introductory chapter of the <fo:inline font-style="italic">GNOME
Applets</fo:inline> book must be removed (as the 1.x
GNOME Help Browser does not allow
you to create links between separate documents) and replaced
with suitable text. Note that since this document is not part
of the <fo:inline font-style="italic">GNOME Applets</fo:inline> book, you must
- remember to add <fo:inline font-family="monospace">&lt;legalnotice&gt;</fo:inline> and
- <fo:inline font-family="monospace">&lt;copyright&gt;</fo:inline> sections.
+ remember to add <fo:inline font-family="Courier">&lt;legalnotice&gt;</fo:inline> and
+ <fo:inline font-family="Courier">&lt;copyright&gt;</fo:inline> sections.
</fo:block>
</fo:block>
<fo:block id="appletmenu">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Adding Documentation to an Applet Menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Adding Documentation to an Applet Menu</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Developer Information</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="id2887281">
+ <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
generally do not need to know this material.
@@ -2588,7 +2588,7 @@ if (tmp) {
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
To add an applet's manual to its applet menu, use:
-<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
/* add an item to the applet menu */
applet_widget_register_callback(APPLET_WIDGET(applet), &quot;manual&quot;,
_(&quot;Manual&quot;), &amp;open_manual, NULL);
@@ -2601,14 +2601,14 @@ _(&quot;Manual&quot;), &amp;open_manual, NULL);
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
You will need to write a simple callback function to open the
help browser to the appropriate document. This is done using
- the <fo:inline font-family="monospace">gnome_help_file_find_file</fo:inline> function,
+ the <fo:inline font-family="Courier">gnome_help_file_find_file</fo:inline> function,
as described in <fo:basic-link internal-destination="applicationhelpbuttons">the section called &#x201C;Application Help Buttons&#x201D;</fo:basic-link>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
You will also want to add an About menu
item to the applet's menu. This is a
stock menu item and is done:
-<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
GNOME_STOCK_MENU_ABOUT, _(&quot;About&quot;), &amp;my_applet_cb_about,
NULL);
@@ -2616,15 +2616,15 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
More information can be found at <fo:basic-link external-destination="http://developer.gnome.org/doc/tutorials/applet/index.html">Writing
- GNOME panel applets using the GTK+/GTK-- widget set</fo:basic-link> [http://developer.gnome.org/doc/tutorials/applet/index.html].
+ GNOME panel applets using the GTK+/GTK-- widget set</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/tutorials/applet/index.html]</fo:inline>.
</fo:block>
</fo:block>
</fo:block>
<fo:block id="writingcontextsensitivehelp">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Writing Context Sensitive Help (coming in GNOME-2.0)</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Writing Context Sensitive Help (coming in GNOME-2.0)</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2666,8 +2666,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="referring">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Referring to Other GNOME Documentation (coming in
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Referring to Other GNOME Documentation (coming in
GNOME-2.0)</fo:block>
</fo:block>
</fo:block>
@@ -2681,8 +2681,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="basics">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Basics of Documentation Style</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Basics of Documentation Style</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2711,8 +2711,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="styleplanning">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Planning</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Planning</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2724,23 +2724,23 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
document that has little or no content. For very large
applications, you will need to make significant departures
from the templates, since you'll be using the
- <fo:inline font-family="monospace">&lt;book&gt;</fo:inline> tag instead of
- <fo:inline font-family="monospace">&lt;chapter&gt;</fo:inline> or
- <fo:inline font-family="monospace">&lt;article&gt;</fo:inline>.
+ <fo:inline font-family="Courier">&lt;book&gt;</fo:inline> tag instead of
+ <fo:inline font-family="Courier">&lt;chapter&gt;</fo:inline> or
+ <fo:inline font-family="Courier">&lt;article&gt;</fo:inline>.
</fo:block>
</fo:block>
<fo:block id="balance">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Achieving a Balanced Style</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Achieving a Balanced Style</fo:block>
</fo:block>
</fo:block>
</fo:block>
<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="id2870668" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item id="id2870673" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
+ <fo:list-block id="id2887795" 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="id2887801" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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), &quot;about&quot;,
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="id2870701" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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="id2887828" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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), &quot;about&quot;,
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="id2870740" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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="id2887867" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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="id2870764" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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="id2887891" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</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
@@ -2780,8 +2780,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="stylestructure">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Structure</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Structure</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2796,7 +2796,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
As to linking, there's some disagreement about whether to use
- <fo:inline font-family="monospace">&lt;xref&gt;</fo:inline> <fo:inline font-family="monospace">&lt;link&gt;</fo:inline>
+ <fo:inline font-family="Courier">&lt;xref&gt;</fo:inline> <fo:inline font-family="Courier">&lt;link&gt;</fo:inline>
when you make links within your documents. You'll have to
decide, based on the different ways that they are presented
in output, which is more appropriate given the context.
@@ -2811,15 +2811,15 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
currently unknown, indexing capabilities, so index style and
structure are still under discussion. The GNOME User's Guide
will contain a glossary in its next versions; unless you're
- writing a<fo:inline font-family="monospace">&lt;book&gt;</fo:inline>, it will probably be best to
+ writing a<fo:inline font-family="Courier">&lt;book&gt;</fo:inline>, it will probably be best to
contribute to that rather than developing your own.
</fo:block>
</fo:block>
<fo:block id="stylegrammar">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Grammar and Spelling</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Grammar and Spelling</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2851,16 +2851,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="teamwork">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Teamwork</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Teamwork</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="teamworkgdp">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Working With The GDP Team</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Working With The GDP Team</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2870,13 +2870,13 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
authors have during the course of their work. It is also
important to make sure you are not duplicating work of other
GDP members by visiting the <fo:inline font-style="italic">GDP Documentation
- Status Table</fo:inline> (<fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">http://www.gnome.org/gdp/doctable/</fo:basic-link> [http://www.gnome.org/gdp/doctable/]) and
+ Status Table</fo:inline> (<fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">http://www.gnome.org/gdp/doctable/</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/gdp/doctable/]</fo:inline>) and
assigning a documentation item to yourself. This table also
provides a forum for making suggestions and announcements for
each documentation item. The best way to get in touch with
GDP members is on the #docs IRC channel at irc.gnome.org or
else by emailing the <fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
- <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline></fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/].
+ <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
After an author has finished a document (or even a draft
@@ -2885,14 +2885,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
proper DocBook markup, and clarity. One may typically find
another author to do this by either asking on the #docs IRC
channel at irc.gnome.org or by emailing the <fo:basic-link external-destination="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/">
- <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline></fo:basic-link> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/].
+ <fo:inline font-style="italic">gnome-doc-list mailing list</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]</fo:inline>.
</fo:block>
</fo:block>
<fo:block id="teamworkdevelopers">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Working With Developers</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Working With Developers</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2912,16 +2912,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="finishing">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Finishing A Document</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Finishing A Document</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="editting">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Editing The Document</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Editing The Document</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2935,8 +2935,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="submitting">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Submitting The Document</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Submitting The Document</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2956,7 +2956,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
The final step is to email the GNOME Translation Team at
- <fo:inline font-family="monospace">&lt;gnome-i18n@nuclecu.unam.mx&gt;</fo:inline> to notify them that
+ <fo:inline font-family="Courier">&lt;gnome-i18n@nuclecu.unam.mx&gt;</fo:inline> to notify them that
there is a new document for them to translate.
</fo:block>
</fo:block>
@@ -2964,38 +2964,38 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="resources">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Resources</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Resources</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block id="resourcesweb">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Resources On The Web</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Resources On The Web</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> The <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/">GNOME
- Documentation Project Web page</fo:basic-link> [http://developer.gnome.org/projects/gdp/] lists current GDP
+ Documentation Project Web page</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/]</fo:inline> lists current GDP
projects and members.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- The <fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">GDP Documentation Status Table</fo:basic-link> [http://www.gnome.org/gdp/doctable/] tracks the
+ The <fo:basic-link external-destination="http://www.gnome.org/gdp/doctable/">GDP Documentation Status Table</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/gdp/doctable/]</fo:inline> tracks the
status of all the various documentation components of GNOME.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Norman Walsh's <fo:basic-link external-destination="http://www.docbook.org"> <fo:inline font-style="italic">DocBook: The Definitive
- Guide</fo:inline></fo:basic-link> [http://www.docbook.org] in an excellent book on DocBook,
+ Guide</fo:inline></fo:basic-link><fo:inline hyphenate="false"> [http://www.docbook.org]</fo:inline> in an excellent book on DocBook,
available both online and in print.
</fo:block>
</fo:block>
<fo:block id="resourcesbooks">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Books</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Books</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -3004,14 +3004,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
form and on the web at:
<fo:basic-link external-destination="http://www.docbook.org/tdg/index.html">
<fo:inline font-style="italic">Docbook: The Definitive Guide</fo:inline>
- </fo:basic-link> [http://www.docbook.org/tdg/index.html]
+ </fo:basic-link><fo:inline hyphenate="false"> [http://www.docbook.org/tdg/index.html]</fo:inline>
</fo:block>
</fo:block>
<fo:block id="mailinglists">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Mailing Lists</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Mailing Lists</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -3019,15 +3019,15 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
The <fo:inline font-style="italic">gnome-docs-list</fo:inline> mailing list is the
main discussion area for all contributors to the GNOME
Documentation Project. You can find out how to subscribe to
- this list on <fo:basic-link external-destination="http://www.gnome.org/resources/mailing-lists.html">GNOME Mailing Lists</fo:basic-link> [http://www.gnome.org/resources/mailing-lists.html]. This is a rather
+ this list on <fo:basic-link external-destination="http://www.gnome.org/resources/mailing-lists.html">GNOME Mailing Lists</fo:basic-link><fo:inline hyphenate="false"> [http://www.gnome.org/resources/mailing-lists.html]</fo:inline>. This is a rather
low-volume list, so you will not be flooded with messages.
</fo:block>
</fo:block>
<fo:block id="irc">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">IRC</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">IRC</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -3041,12 +3041,12 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
</fo:block>
<fo:block id="templates">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix A. Document Templates</fo:block>
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Document Templates</fo:block>
<fo:block id="template1">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 1: Application Manual</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 1: Application Manual</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -3054,8 +3054,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
The following template should be used for all application
manuals. You can always get the latest copy of this
template from <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/templates.html">GDP
- Documentation Templates</fo:basic-link> [http://developer.gnome.org/projects/gdp/templates.html].
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ Documentation Templates</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/templates.html]</fo:inline>.
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!DOCTYPE Article PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot;[
@@ -3791,8 +3791,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="template2-1x">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 2: Applet Manual For GNOME 1.x</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 2: Applet Manual For GNOME 1.x</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -3800,16 +3800,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
The following templates should be used for all applet
manuals in GNOME 1.x releases. You can always get the latest
copy of these templates from <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/templates.html">GDP
- Documentation Templates</fo:basic-link> [http://developer.gnome.org/projects/gdp/templates.html]. Note that the template
+ Documentation Templates</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/templates.html]</fo:inline>. Note that the template
consists of two files; the first file calls the second as an
entity. You should name the first file
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">appletname</fo:inline>-applet.sgml</fo:inline>
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">appletname</fo:inline>-applet.sgml</fo:inline>
and the second file should be named
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">appletname</fo:inline>.sgml</fo:inline>,
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">appletname</fo:inline>.sgml</fo:inline>,
where
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">appletname</fo:inline></fo:inline> is
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">appletname</fo:inline></fo:inline> is
the name of the applet.
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!DOCTYPE Article PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot;[
@@ -3889,7 +3889,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!-- Template Version: 1.0.1 (do not remove this line) --&gt;
@@ -4123,8 +4123,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<fo:block id="template2-2x">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 2: Applet Manual For GNOME 2.x</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Template 2: Applet Manual For GNOME 2.x</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -4132,7 +4132,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
The following templates should be used for all applet
manuals in GNOME 2.x releases. You can always get the latest
copy of these templates from <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/templates.html">GDP
- Documentation Templates</fo:basic-link> [http://developer.gnome.org/projects/gdp/templates.html].
+ Documentation Templates</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/templates.html]</fo:inline>.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
Note that this template consists of two files. The first file
@@ -4140,15 +4140,15 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
chapter. The second file is the actual applet document, which
you should modify to describe the applet you are documenting.
You can name the first file whatever you like, such as
- <fo:inline font-family="monospace">gnome-applets.sgml</fo:inline>. Name the second file
+ <fo:inline font-family="Courier">gnome-applets.sgml</fo:inline>. Name the second file
according to the applet's name:
- <fo:inline font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">appletname</fo:inline>-applet.sgml</fo:inline>.
+ <fo:inline font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">appletname</fo:inline>-applet.sgml</fo:inline>.
Make sure you update the entity
at the top of the shell document to reflect the new name of
the applet document.
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!DOCTYPE book PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant V1.1//EN&quot;[
&lt;!ENTITY TEMPLATE-APPLET SYSTEM &quot;gnome-applet-template.sgml.part&quot;&gt;
@@ -4603,7 +4603,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
&lt;!-- Please replace everywhere below GNOMEAPPLET with the name of --&gt;
diff --git a/tests/docbook/result/fo/graphics.fo b/tests/docbook/result/fo/graphics.fo
index 55a42d1b..80ef9d87 100644
--- a/tests/docbook/result/fo/graphics.fo
+++ b/tests/docbook/result/fo/graphics.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2742057" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2756378" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,74 +89,74 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Graphics Test Document Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Graphics Test Document Title</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2742067">
+ <fo:block id="id2761007">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Graphic</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Graphic</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">entityref:</fo:block>
<fo:block>
- <fo:external-graphic src="" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url()" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, scale=200:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, width=20, depth=20</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
</fo:block>
</fo:block>
- <fo:block id="id2742185">
+ <fo:block id="id2761134">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inlinegraphic</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Inlinegraphic</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref: <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">entityref: <fo:external-graphic src="" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, scale=200: <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref: <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">entityref: <fo:external-graphic src="url()" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, scale=200: <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
</fo:block>
- <fo:block id="id2742265">
+ <fo:block id="id2761217">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">MediaObject</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">MediaObject</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">entityref:</fo:block>
<fo:block>
- <fo:external-graphic src="" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url()" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, scale=20:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, width=200, depth=400:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="200pt" content-height="200pt" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="200pt" content-height="400pt" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, width=20, depth=20, alt=Alt text:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.png" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.png)" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
</fo:block>
</fo:block>
</fo:flow>
diff --git a/tests/docbook/result/fo/gtest.fo b/tests/docbook/result/fo/gtest.fo
index ad657383..4a56063a 100644
--- a/tests/docbook/result/fo/gtest.fo
+++ b/tests/docbook/result/fo/gtest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,10 +81,10 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599600" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2756009" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Graphics Test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Graphics Test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -95,16 +95,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Graphics Test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Graphics Test</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">A graphic by fileref:</fo:block>
<fo:block>
- <fo:external-graphic src="file:emc2.gif" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url(file:emc2.gif)" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">A graphic by entityref:</fo:block>
<fo:block>
- <fo:external-graphic src="" content-width="auto" content-height="auto" width="auto" height="auto"/>
+ <fo:external-graphic src="url()" content-width="auto" content-height="auto" width="auto" height="auto"/>
</fo:block>
</fo:flow>
</fo:page-sequence>
diff --git a/tests/docbook/result/fo/idxbook.fo b/tests/docbook/result/fo/idxbook.fo
index c834f66b..d45fd8dd 100644
--- a/tests/docbook/result/fo/idxbook.fo
+++ b/tests/docbook/result/fo/idxbook.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599920" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2599702" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Index Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Index Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -93,7 +93,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Index Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Index Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
@@ -104,22 +104,40 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742237"/></fo:block>
- <fo:block>1.First Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759292"><fo:page-number-citation ref-id="id2759292"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 First Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>First Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741936"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758992"><fo:page-number-citation ref-id="id2758992"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Second Chapter</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="ch2"><fo:page-number-citation ref-id="ch2"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761932"><fo:page-number-citation ref-id="id2761932"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763330"><fo:page-number-citation ref-id="id2763330"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>2.Second Chapter<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="ch2"/></fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2744855"/></fo:block>
- <fo:block>Index<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2746232"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2742237" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2759292" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -128,16 +146,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph<fo:wrapper id="id2742255"><!--paragraph, test--></fo:wrapper>.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph<fo:wrapper id="id2759310"><!--paragraph, test--></fo:wrapper>.</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. First Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. First Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -148,26 +166,26 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. First Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. First Chapter</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph<fo:wrapper id="id2741922"><!--paragraph--></fo:wrapper>.</fo:block>
- <fo:block id="id2741936">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph<fo:wrapper id="id2758977"><!--paragraph--></fo:wrapper>.</fo:block>
+ <fo:block id="id2758992">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another paragraph<fo:wrapper id="id2741954"><!--paragraph, another--></fo:wrapper>.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another paragraph<fo:wrapper id="id2759009"><!--paragraph, another--></fo:wrapper>.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="ch2" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Second Chapter</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Second Chapter</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -178,31 +196,31 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. Second Chapter</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. Second Chapter</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.
-<fo:wrapper id="id2862949"><!--the ap1--></fo:wrapper>
-<fo:wrapper id="id2862974"><!--the ap1--></fo:wrapper>
-<fo:wrapper id="id2862957"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2880046"><!--the ap1--></fo:wrapper>
+<fo:wrapper id="id2880070"><!--the ap1--></fo:wrapper>
+<fo:wrapper id="id2880075"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2836717"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2836740"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2853817"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2853840"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2836756"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2853856"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2744746"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2744762"><!--cp2see, cp2seesec--></fo:wrapper>
+<fo:wrapper id="id2761821"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2761837"><!--cp2see, cp2seesec--></fo:wrapper>
-<fo:wrapper id="id2744792"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2744816"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2744839"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2761868"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2761891"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2761915"><!--dp2--></fo:wrapper></fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2744855" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2761932" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -213,30 +231,30 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.
-<fo:wrapper id="id2744873"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2744889"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2761948"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2761964"><!--ap2--></fo:wrapper>
-<fo:wrapper id="id2744905"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2744928"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2761979"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2762003"><!--bp2--></fo:wrapper>
-<fo:wrapper id="id2744944"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2744975"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2762018"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2762050"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2744991"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2745015"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2745038"><!--dp2--></fo:wrapper>
+<fo:wrapper id="id2762066"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2762089"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2762113"><!--dp2--></fo:wrapper>
-<fo:wrapper id="id2746173"><!--1 digit test--></fo:wrapper>
-<fo:wrapper id="id2746189"><!--[square bracket test]--></fo:wrapper>
-<fo:wrapper id="id2746205"><!--2 digit test--></fo:wrapper>
+<fo:wrapper id="id2763272"><!--1 digit test--></fo:wrapper>
+<fo:wrapper id="id2763288"><!--[square bracket test]--></fo:wrapper>
+<fo:wrapper id="id2763304"><!--2 digit test--></fo:wrapper>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2746232" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2763330" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -245,93 +263,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block/>
- </fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">Symbols</fo:block>
- <fo:block>
- <fo:block>1 digit test, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2746173"/></fo:block>
- <fo:block>2 digit test, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2746205"/></fo:block>
- <fo:block>[square bracket test], <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2746189"/></fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">A</fo:block>
- <fo:block>
- <fo:block>the ap1, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2862949"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744873"/></fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>see also ap2</fo:block>
- </fo:block>
- </fo:block>
- <fo:block>ap2, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2862957"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744889"/></fo:block>
- </fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">B</fo:block>
- <fo:block>
- <fo:block>bp1</fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>bp1bs1, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2836717"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744905"/></fo:block>
- </fo:block>
- </fo:block>
- <fo:block>bp2, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2836740"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744928"/></fo:block>
- </fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">C</fo:block>
- <fo:block>
- <fo:block>chapter zone, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="chapter"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="ch2"/></fo:block>
- <fo:block>cp1</fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>cp1cs1</fo:block>
- <fo:block start-indent="2pc">
- <fo:block>
- <fo:block>cp1cs1ct1, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2836756"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744944"/></fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- <fo:block>cp2, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744746"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744975"/></fo:block>
- <fo:block>cp2see</fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>cp2seesec</fo:block>
- <fo:block start-indent="2pc">
- <fo:block>
- <fo:block>cp2</fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">D</fo:block>
- <fo:block>
- <fo:block>dp1</fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>dp1ds1, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744792"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744991"/></fo:block>
- <fo:block>dp1ds2, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744816"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2745015"/></fo:block>
- </fo:block>
- </fo:block>
- <fo:block>dp2, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2744839"/>, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2745038"/></fo:block>
- </fo:block>
- </fo:block>
- <fo:block>
- <fo:block font-size="16pt" font-weight="bold" keep-with-next="always" space-before="1em">P</fo:block>
- <fo:block>
- <fo:block>paragraph, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2741922"/></fo:block>
- <fo:block start-indent="1pc">
- <fo:block>
- <fo:block>another, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2741954"/></fo:block>
- <fo:block>test, <fo:page-number-citation xmlns:fo="http://www.w3.org/1999/XSL/Format" ref-id="id2742255"/></fo:block>
- </fo:block>
- </fo:block>
- </fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Index</fo:block>
</fo:block>
</fo:block>
</fo:flow>
diff --git a/tests/docbook/result/fo/kwrite.fo b/tests/docbook/result/fo/kwrite.fo
index d8baee61..1fe43c8e 100644
--- a/tests/docbook/result/fo/kwrite.fo
+++ b/tests/docbook/result/fo/kwrite.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,21 +81,21 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2836715" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2756627" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>the kwrite handbook</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">the kwrite handbook</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">thad mcginnis<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;ctmcginnis@compuserve.com&gt;</fo:inline></fo:block></fo:block>jochenwilhelmyprincipal developerdigisnap@cs.tu-berlin.deglenparkeradditional developmentglenebob@nwlink.commichaelkochadditional developmentkoch@kde.orgchristiantibirnaoriginal help documenttibirna@kde.orglauriwattsreviewervampyr@atconnex.net</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">thad mcginnis<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;ctmcginnis@compuserve.com&gt;</fo:inline></fo:block></fo:block></fo:block>jochenwilhelmyprincipal developerdigisnap@cs.tu-berlin.deglenparkeradditional developmentglenebob@nwlink.commichaelkochadditional developmentkoch@kde.orgchristiantibirnaoriginal help documenttibirna@kde.orglauriwattsreviewervampyr@atconnex.net</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
<fo:block>the kwrite handbook</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
- <fo:block>by thad mcginnisjochen wilhelmy<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;digisnap@cs.tu-berlin.de&gt;</fo:inline></fo:block>glen parker<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;glenebob@nwlink.com&gt;</fo:inline></fo:block>michael koch<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;koch@kde.org&gt;</fo:inline></fo:block>christian tibirna<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;tibirna@kde.org&gt;</fo:inline></fo:block>lauri watts<fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">&lt;vampyr@atconnex.net&gt;</fo:inline></fo:block></fo:block>
+ <fo:block>by thad mcginnisjochen wilhelmy<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;digisnap@cs.tu-berlin.de&gt;</fo:inline></fo:block></fo:block>glen parker<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;glenebob@nwlink.com&gt;</fo:inline></fo:block></fo:block>michael koch<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;koch@kde.org&gt;</fo:inline></fo:block></fo:block>christian tibirna<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;tibirna@kde.org&gt;</fo:inline></fo:block></fo:block>lauri watts<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="Courier">&lt;vampyr@atconnex.net&gt;</fo:inline></fo:block></fo:block></fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 2000, 2001 by thad mcginnis</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 2000, 2001 thad mcginnis</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">this handbook describes kwrite version 2.0</fo:block>
@@ -117,49 +117,121 @@ with no back-cover texts. a copy of the license is included in <fo:basic-link i
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.introduction<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="introduction"/></fo:block>
- <fo:block>2.some fundamentals<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="on-screen-fundamentals"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 introduction</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="introduction"><fo:page-number-citation ref-id="introduction"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 some fundamentals</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="on-screen-fundamentals"><fo:page-number-citation ref-id="on-screen-fundamentals"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>drag and drop<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="drag-and-drop"/></fo:block>
- <fo:block>command line options<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="command-line-options"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>specify a file<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="specify-a-file"/></fo:block>
- <fo:block>specify a file on the internet<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="editing-files-on-the-internet"/></fo:block>
- <fo:block>other command line options<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="other-command-line-options"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> drag and drop</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="drag-and-drop"><fo:page-number-citation ref-id="drag-and-drop"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> command line options</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="command-line-options"><fo:page-number-citation ref-id="command-line-options"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>key bindings<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="keybindings"/></fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> specify a file</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="specify-a-file"><fo:page-number-citation ref-id="specify-a-file"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> specify a file on the internet</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="editing-files-on-the-internet"><fo:page-number-citation ref-id="editing-files-on-the-internet"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> other command line options</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="other-command-line-options"><fo:page-number-citation ref-id="other-command-line-options"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> key bindings</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="keybindings"><fo:page-number-citation ref-id="keybindings"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 the menu entries</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="the-menu-entries"><fo:page-number-citation ref-id="the-menu-entries"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>3.the menu entries<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="the-menu-entries"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>the file menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="file"/></fo:block>
- <fo:block>the edit menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="edit"/></fo:block>
- <fo:block>the go menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="go"/></fo:block>
- <fo:block>the tools menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="tools"/></fo:block>
- <fo:block>the settings menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="settings"/></fo:block>
- <fo:block>the help menu<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="help"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the file menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="file"><fo:page-number-citation ref-id="file"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the edit menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="edit"><fo:page-number-citation ref-id="edit"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the go menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="go"><fo:page-number-citation ref-id="go"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the tools menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="tools"><fo:page-number-citation ref-id="tools"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the settings menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="settings"><fo:page-number-citation ref-id="settings"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> the help menu</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="help"><fo:page-number-citation ref-id="help"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4 configure kwrite</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="pref-dialog"><fo:page-number-citation ref-id="pref-dialog"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>4.configure kwrite<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="pref-dialog"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>colors<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="prefcolors"/></fo:block>
- <fo:block>indent<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="pref-indent"/></fo:block>
- <fo:block>select<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="pref-select"/></fo:block>
- <fo:block>edit<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="pref-edit"/></fo:block>
- <fo:block>spelling<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="prefspellchecker"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> colors</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="prefcolors"><fo:page-number-citation ref-id="prefcolors"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> indent</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="pref-indent"><fo:page-number-citation ref-id="pref-indent"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> select</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="pref-select"><fo:page-number-citation ref-id="pref-select"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> edit</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="pref-edit"><fo:page-number-citation ref-id="pref-edit"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> spelling</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="prefspellchecker"><fo:page-number-citation ref-id="prefspellchecker"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">5 highlighting</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="pref-highlighting"><fo:page-number-citation ref-id="pref-highlighting"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">6 credits and licenses</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="credits"><fo:page-number-citation ref-id="credits"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A installation</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="installation"><fo:page-number-citation ref-id="installation"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>5.highlighting<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="pref-highlighting"/></fo:block>
- <fo:block>6.credits and licenses<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="credits"/></fo:block>
- <fo:block>A.installation<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="installation"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="introduction" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. introduction</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. introduction</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -170,7 +242,7 @@ with no back-cover texts. a copy of the license is included in <fo:basic-link i
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. introduction</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. introduction</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">kwrite is more than a text editor for the kde desktop. it is meant
@@ -186,7 +258,7 @@ bash, modula 2, html, and ada.</fo:block>
<fo:page-sequence id="on-screen-fundamentals" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. some fundamentals</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. some fundamentals</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -197,7 +269,7 @@ bash, modula 2, html, and ada.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 2. some fundamentals</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 2. some fundamentals</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">kwrite is very simple to use. anyone that has used a text editor should
@@ -205,8 +277,8 @@ have no problems. </fo:block>
<fo:block id="drag-and-drop">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">drag and drop</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">drag and drop</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -218,8 +290,8 @@ of konqueror's windows. </fo:block>
<fo:block id="command-line-options">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">command line options</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">command line options</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -230,8 +302,8 @@ doing this.</fo:block>
<fo:block id="specify-a-file">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">specify a file</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">specify a file</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -239,14 +311,14 @@ doing this.</fo:block>
have kwrite open (or create) that file immediately upon startup. this
option might look something like the following:</fo:block>
<fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">%</fo:inline> <fo:inline font-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">/home/myhome/docs/myfile.txt</fo:inline></fo:inline></fo:inline></fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt"><fo:inline font-family="Courier">%</fo:inline> <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">/home/myhome/docs/myfile.txt</fo:inline></fo:inline></fo:inline></fo:block>
</fo:block>
</fo:block>
<fo:block id="editing-files-on-the-internet">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">specify a file on the internet</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">specify a file on the internet</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -254,24 +326,24 @@ option might look something like the following:</fo:block>
internet (if the user has an active connection at the time.) an example of
this might look like the following:</fo:block>
<fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"><fo:inline font-family="monospace">%</fo:inline> <fo:inline font-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="monospace">ftp://ftp.kde.org/pub/kde/welcome.msg</fo:inline></fo:inline></fo:inline></fo:block>
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt"><fo:inline font-family="Courier">%</fo:inline> <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-style="italic" font-family="Courier">ftp://ftp.kde.org/pub/kde/welcome.msg</fo:inline></fo:inline></fo:inline></fo:block>
</fo:block>
</fo:block>
<fo:block id="other-command-line-options">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="14pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">other command line options</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">other command line options</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">the following command line help options are available</fo:block>
- <fo:list-block id="id2742537" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2742543" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2759638" 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="id2759644" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--help</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--help</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -280,11 +352,11 @@ this might look like the following:</fo:block>
line.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2742586" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2759687" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--help-qt</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--help-qt</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -293,11 +365,11 @@ line.</fo:block>
kwrite interacts with qt.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2742647" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2759422" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--help-kde</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--help-kde</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -306,11 +378,11 @@ kwrite interacts with qt.</fo:block>
kwrite interacts with kde.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2742700" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2761449" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--help-all</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--help-all</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -318,11 +390,11 @@ kwrite interacts with kde.</fo:block>
<fo:block>this lists all of the command line options.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2742745" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2761493" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--author</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--author</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -330,16 +402,16 @@ kwrite interacts with kde.</fo:block>
<fo:block>lists kwrite's authors in the terminal window</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2742797" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2757713" 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-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">--version</fo:inline></fo:inline>
+ <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">--version</fo:inline></fo:inline>
</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>lists version information for qt, kde, and kwrite. also available through <fo:inline font-weight="bold" font-family="monospace"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="monospace">-v</fo:inline></fo:inline> </fo:block>
+ <fo:block>lists version information for qt, kde, and kwrite. also available through <fo:inline font-weight="bold" font-family="Courier"><fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-weight="bold">kwrite</fo:inline> <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Courier">-v</fo:inline></fo:inline> </fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -348,16 +420,16 @@ kwrite interacts with kde.</fo:block>
<fo:block id="keybindings">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">key bindings</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">key bindings</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">many of the key bindings (shortcuts) are configurable by way of the <fo:basic-link internal-destination="settings">settings</fo:basic-link> menu. by default kwrite honors the
following key bindings.</fo:block>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -720,7 +792,7 @@ text)</fo:block>
<fo:page-sequence id="the-menu-entries" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. the menu entries</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. the menu entries</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -731,22 +803,22 @@ text)</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 3. the menu entries</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 3. the menu entries</fo:block>
</fo:block>
</fo:block>
<fo:block id="file">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the file menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the file menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2863636" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2863642" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2880739" 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="id2880745" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;new (<fo:inline font-weight="bold">ctrl-n</fo:inline>)</fo:inline>
+ <fo:inline>file-&gt;new (<fo:inline font-weight="bold">ctrl-n</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -754,10 +826,10 @@ text)</fo:block>
document with unsaved changes the user is given a chance to save it.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863747" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2880850" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;0pen (<fo:inline font-weight="bold">ctrl-o</fo:inline>)</fo:inline>
+ <fo:inline>file-&gt;0pen (<fo:inline font-weight="bold">ctrl-o</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -771,7 +843,7 @@ side choose from a dropdown list of recently used locations. below this is
a filter which similarly may have data entered directly or chosen from a
dropdown list of recent filter types. the filter facility lets only files
that meet its specifications be displayed in the central window. if the
-filter contained text such as <fo:inline font-family="monospace">*.txt</fo:inline> then only files
+filter contained text such as <fo:inline font-family="Courier">*.txt</fo:inline> then only files
with the txt extension would be visible in the selection window. below the filter
is a status bar giving information about the number of files and subdirectories
within the current directory.</fo:block>
@@ -787,10 +859,10 @@ directory, and finally there is dropdown box with a list of some commonly
frequented directories.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863902" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881005" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;open
+ <fo:inline>file-&gt;open
recent</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -801,10 +873,10 @@ saved files. clicking on a specific file will open it in kwrite - if the file
still resides at the same location. </fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2863989" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881092" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;save (<fo:inline font-weight="bold">ctrl-s</fo:inline>)</fo:inline>
+ <fo:inline>file-&gt;save (<fo:inline font-weight="bold">ctrl-s</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -814,10 +886,10 @@ asking for the user's consent. if it is the first save of a new document the
save as dialog (described below) will be invoked.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864097" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881200" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;save
+ <fo:inline>file-&gt;save
as</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -826,20 +898,20 @@ as</fo:inline>
done by means of the file dialog box described above in the <fo:basic-link internal-destination="open">open</fo:basic-link> section of this help file.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864194" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881296" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;print (<fo:inline font-weight="bold">ctrl-p</fo:inline>)</fo:inline>
+ <fo:inline>file-&gt;print (<fo:inline font-weight="bold">ctrl-p</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>opens a simple print dialog allowing the user to specify what, where, and how to print</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864298" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881401" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;new window</fo:inline>
+ <fo:inline>file-&gt;new window</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -847,10 +919,10 @@ done by means of the file dialog box described above in the <fo:basic-link inter
on more than one file at a time with kwrite.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864398" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881500" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;new view</fo:inline>
+ <fo:inline>file-&gt;new view</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -859,10 +931,10 @@ kwrite (as explained in the previous entry) but containing the same
document.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864490" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881592" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>file-&gt;quit (<fo:inline font-weight="bold">ctrl-q</fo:inline>)</fo:inline>
+ <fo:inline>file-&gt;quit (<fo:inline font-weight="bold">ctrl-q</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -877,16 +949,16 @@ closed.</fo:block>
<fo:block id="edit">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the edit menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the edit menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2864653" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2864660" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2881756" 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="id2881762" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;undo (<fo:inline font-weight="bold">ctrl-z</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;undo (<fo:inline font-weight="bold">ctrl-z</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -894,20 +966,20 @@ closed.</fo:block>
constitutes such an action may be better understood by referring to the <fo:basic-link internal-destination="group-undos">group undos</fo:basic-link> portion of this help file.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864786" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2881889" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;redo (<fo:inline font-weight="bold">ctrl-shift-z</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;redo (<fo:inline font-weight="bold">ctrl-shift-z</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>this will reverse the most recent change (if any) made using undo</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2864900" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882003" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;undo/redo history</fo:inline>
+ <fo:inline>edit-&gt;undo/redo history</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -928,10 +1000,10 @@ proceed - making it unnecessary to go through a series of single undo or redo
actions.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865041" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882144" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;cut (<fo:inline font-weight="bold">ctrl-x</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;cut (<fo:inline font-weight="bold">ctrl-x</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -940,10 +1012,10 @@ clipboard is a feature of kde that works invisibly to provide a way to transfer
applications.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882252" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;copy (<fo:inline font-weight="bold">ctrl-c</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;copy (<fo:inline font-weight="bold">ctrl-c</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -952,10 +1024,10 @@ pasted elsewhere. the clipboard is a feature of kde that works invisibly to
provide a way to transfer data between applications.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865256" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882359" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;paste (<fo:inline font-weight="bold">ctrl-v</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;paste (<fo:inline font-weight="bold">ctrl-v</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -964,10 +1036,10 @@ clipboard is feature of kde that works invisibly to provide a way to transfer
data between applications.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865363" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882466" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;select all (<fo:inline font-weight="bold">ctrl-a</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;select all (<fo:inline font-weight="bold">ctrl-a</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -975,10 +1047,10 @@ data between applications.</fo:block>
copying the entire file to another application.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865470" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882573" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;invert selection</fo:inline>
+ <fo:inline>edit-&gt;invert selection</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -986,10 +1058,10 @@ copying the entire file to another application.</fo:block>
effectively reversing the current state of selection.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865548" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882651" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;find (<fo:inline font-weight="bold">ctrl-f</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;find (<fo:inline font-weight="bold">ctrl-f</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1009,10 +1081,10 @@ the search from the current position of the cursor within the document rather
than from the beginning.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865714" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882817" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;find next (<fo:inline font-weight="bold">f3</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;find next (<fo:inline font-weight="bold">f3</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1020,10 +1092,10 @@ than from the beginning.</fo:block>
dialog box.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865813" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2882916" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>edit-&gt;replace (<fo:inline font-weight="bold">ctrl-r</fo:inline>)</fo:inline>
+ <fo:inline>edit-&gt;replace (<fo:inline font-weight="bold">ctrl-r</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1036,10 +1108,10 @@ on replace option allows the user to have kwrite ask for
confirmation before each replacement.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2865947" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883050" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>
+ <fo:inline>
edit-&gt;insert file</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -1055,16 +1127,16 @@ cursor.</fo:block>
<fo:block id="go">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the go menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the go menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2866093" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866100" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2883196" 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="id2883203" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>go-&gt;go to line</fo:inline>
+ <fo:inline>go-&gt;go to line</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1077,10 +1149,10 @@ control to the right of the text box which allows the user to move the goto
point in the document in an analog manner.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866181" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883284" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>go-&gt;add marker (<fo:inline font-weight="bold">ctrl-m</fo:inline>)</fo:inline>
+ <fo:inline>go-&gt;add marker (<fo:inline font-weight="bold">ctrl-m</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1092,10 +1164,10 @@ marked for easy return. if the user thinks (s)he may need to return to a specif
point (s)he may by way of this feature instruct kwrite to remember it. </fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866314" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883417" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>go-&gt;set marker</fo:inline>
+ <fo:inline>go-&gt;set marker</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1104,10 +1176,10 @@ located, and allows the user to choose its position in the list of bookmarks
which is appended at the bottom of this menu item.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866390" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883493" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>go-&gt;clear markers</fo:inline>
+ <fo:inline>go-&gt;clear markers</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1122,16 +1194,16 @@ markers are available for this window.</fo:block>
<fo:block id="tools">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the tools menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the tools menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2866509" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866516" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2883612" 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="id2883618" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>tools-&gt;spelling...</fo:inline>
+ <fo:inline>tools-&gt;spelling...</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1141,8 +1213,8 @@ clicking on this entry will start the checker and bring up the speller dialog
box through which the user can control the process. there are three text boxes
lined up vertically in the center of the dialog with their corresponding labels
just to the left. starting at the top they are:</fo:block>
- <fo:list-block id="id2866598" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866604" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2883700" 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="id2883707" 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>misspelled word:</fo:inline>
@@ -1155,7 +1227,7 @@ dictionary - a file containing a list of correctly spelled words against which
it compares each word in the editor.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866644" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883746" 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>replacement:</fo:inline>
@@ -1168,7 +1240,7 @@ or her own correction, or choose a different suggestion from the next
box.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866682" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883785" 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>suggestions:</fo:inline>
@@ -1184,8 +1256,8 @@ above.</fo:block>
</fo:list-block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">on the right side of the dialog box are 6 buttons that allow the user to
control the spell check process. they are:</fo:block>
- <fo:list-block id="id2866740" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2866747" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2883843" 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="id2883850" 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>replace</fo:inline>
@@ -1197,7 +1269,7 @@ consideration in the document with the word in the
replacement: box.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866791" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883894" 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>replace all</fo:inline>
@@ -1210,7 +1282,7 @@ substitution for any other occurences of this misspelled
word: in the document.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866845" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883947" 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>ignore</fo:inline>
@@ -1221,7 +1293,7 @@ word: in the document.</fo:block>
making any changes.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866880" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2883983" 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>ignore all</fo:inline>
@@ -1231,15 +1303,15 @@ making any changes.</fo:block>
<fo:block> this button tells the checker to do nothing with the current
misspelled word: and to pass over any other instances of
the same word.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2884024">
+ <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">this only applies to the current spell check
run. if the checker is run again later it will stop on this same
word.</fo:block>
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866943" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884046" 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>add</fo:inline>
@@ -1252,7 +1324,7 @@ the checker will always consider this word to be correctly
spelled.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2866988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884091" 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>stop</fo:inline>
@@ -1268,15 +1340,15 @@ progress bar. as the checking process proceeds the bar will fill from left to
right providing a graphical representation of how far along in the document the
process has reached. in addition, the progress is displayed numerically in
the center of the progress bar.</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2884148">
+ <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">a numerical display of the spell check
process is simultaneously displayed in the status bar of the editor. the <fo:basic-link internal-destination="show-statusbar">status bar</fo:basic-link> is the horizontal strip at the bottom
of the editor just outside of the text entry area.</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">two more buttons are located below the progress bar. they are:</fo:block>
- <fo:list-block id="id2867094" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867101" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884197" 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="id2884204" 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>help</fo:inline>
@@ -1287,7 +1359,7 @@ of the editor just outside of the text entry area.</fo:block>
pages (this document).</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867145" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884247" 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>cancel</fo:inline>
@@ -1297,10 +1369,10 @@ pages (this document).</fo:block>
<fo:block> this button cancels the spell check process.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867180" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884283" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>tools-&gt;indent</fo:inline>
+ <fo:inline>tools-&gt;indent</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1309,10 +1381,10 @@ step depends on the <fo:basic-link internal-destination="pref-indent"> indentati
settings</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867264" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884367" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>tools-&gt;unindent</fo:inline>
+ <fo:inline>tools-&gt;unindent</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1320,10 +1392,10 @@ settings</fo:basic-link>.</fo:block>
depends on the <fo:basic-link internal-destination="pref-indent"> indentation settings</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867344" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884447" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>tools-&gt;clean
+ <fo:inline>tools-&gt;clean
indentation</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -1331,7 +1403,7 @@ indentation</fo:inline>
<fo:block>not yet implemented</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867406" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884509" 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>tools-&gt;comment</fo:inline>
@@ -1343,7 +1415,7 @@ where the text cursor is located or to the beginning of any
selected lines.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867459" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884562" 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>tools-&gt;uncomment</fo:inline>
@@ -1363,16 +1435,16 @@ selected lines.</fo:block>
<fo:block id="settings">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the settings menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the settings menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2867551" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2867558" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2884654" 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="id2884660" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;show toolbar</fo:inline>
+ <fo:inline>settings-&gt;show toolbar</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1380,10 +1452,10 @@ selected lines.</fo:block>
initiate frequently used commands. when unchecked the toolbar is hidden.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867636" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884739" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;show statusbar</fo:inline>
+ <fo:inline>settings-&gt;show statusbar</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1392,10 +1464,10 @@ containing information about the status of the current document. when unchecked
the statusbar is hidden.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867715" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884818" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;show path</fo:inline>
+ <fo:inline>settings-&gt;show path</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1403,10 +1475,10 @@ the statusbar is hidden.</fo:block>
file system) of the current document. when unchecked the path is hidden.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867793" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2884896" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;configure key bindings</fo:inline>
+ <fo:inline>settings-&gt;configure key bindings</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1428,10 +1500,10 @@ would mean that anytime he or she held down the <fo:inline font-weight="bold">ct
kwrite) the about kde display box would be called. </fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2867965" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885068" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;configure toolbars</fo:inline>
+ <fo:inline>settings-&gt;configure toolbars</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1448,17 +1520,17 @@ an action selected in the right window which changes the position of its button
in the toolbar.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868063" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885166" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;preferences</fo:inline>
+ <fo:inline>settings-&gt;preferences</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>this menu item opens a dialog whereby several different <fo:basic-link internal-destination="pref-dialog">settings</fo:basic-link> may be adjusted.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868157" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885260" 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>settings-&gt;configure
@@ -1467,13 +1539,13 @@ highlighting</fo:inline>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>opens a dialog box allowing configuration of the syntax
-highlighting. the dialog is described in <fo:basic-link internal-destination="pref-highlighting">Chapter 5., <fo:inline font-style="italic">highlighting</fo:inline></fo:basic-link>.</fo:block>
+highlighting. the dialog is described in <fo:basic-link internal-destination="pref-highlighting">Chapter 5. highlighting</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868240" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885343" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;vertical
+ <fo:inline>settings-&gt;vertical
selection</fo:inline>
</fo:block>
</fo:list-item-label>
@@ -1485,10 +1557,10 @@ particular contiguous columns and rows. in affect the user can select a
rectangular area of text anywhere in the document.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868320" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885422" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;highlight mode</fo:inline>
+ <fo:inline>settings-&gt;highlight mode</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1497,15 +1569,15 @@ editor uses to display the text. the styles are selected by programming
language. the font/color information is not stored with the document.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868396" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885499" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>settings-&gt;end of line</fo:inline>
+ <fo:inline>settings-&gt;end of line</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>this opens a sub-menu from which the user can select the type of `end of
-line' code for kwrite to use, i.e., the accepted standard
+ <fo:block>this opens a sub-menu from which the user can select the type of &#x2018;end of
+line&#x2019; code for kwrite to use, i.e., the accepted standard
used by unix, mac&#xAE; or msdos/windows&#xAE; systems.</fo:block>
</fo:list-item-body>
</fo:list-item>
@@ -1514,26 +1586,26 @@ used by unix, mac&#xAE; or msdos/windows&#xAE; systems.</fo:block>
<fo:block id="help">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the help menu</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">the help menu</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2868554" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2868561" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2885657" 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="id2885664" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>help-&gt;contents (<fo:inline font-weight="bold">f1</fo:inline>)</fo:inline>
+ <fo:inline>help-&gt;contents (<fo:inline font-weight="bold">f1</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>this invokes the kde help system starting at the kwrite help pages (this document).</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868665" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885768" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>help-&gt;what's this? (<fo:inline font-weight="bold">shift-f1</fo:inline>)</fo:inline>
+ <fo:inline>help-&gt;what's this? (<fo:inline font-weight="bold">shift-f1</fo:inline>)</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1542,10 +1614,10 @@ clicking on items within kwrite with this arrow will open a help window (if
one exists for the particular item) explaining the item's function.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868782" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885885" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>help-&gt;report bug</fo:inline>
+ <fo:inline>help-&gt;report bug</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1555,20 +1627,20 @@ problems(bugs) in the program. the dialog attempts to do this by
means of email using the information given by the user.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868860" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2885963" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>help-&gt;about kwrite</fo:inline>
+ <fo:inline>help-&gt;about kwrite</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block>this will display version and author information</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2868933" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886036" 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:block color="red">&lt;anchor&gt;&lt;/anchor&gt;</fo:block>help-&gt;about kde</fo:inline>
+ <fo:inline>help-&gt;about kde</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -1582,7 +1654,7 @@ means of email using the information given by the user.</fo:block>
<fo:page-sequence id="pref-dialog" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">4. configure kwrite</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 4. configure kwrite</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1593,7 +1665,7 @@ means of email using the information given by the user.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 4. configure kwrite</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 4. configure kwrite</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">selecting
@@ -1612,8 +1684,8 @@ spelling are detailed below.</fo:block>
<fo:block id="prefcolors">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">colors</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">colors</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -1654,7 +1726,7 @@ palette and any other available palettes can be displayed using the drop down
selection box located directly above the palette display at the top right of the
dialog box. besides the custom colors, the user can access a number of
pre-prepared palettes.</fo:block>
- <fo:list-block id="id2869299" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2886402" 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="pref-color-settings" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>
@@ -1666,7 +1738,7 @@ pre-prepared palettes.</fo:block>
kwrite.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869358" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886461" 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>text background</fo:inline>
@@ -1677,7 +1749,7 @@ kwrite.</fo:block>
background of those areas of the document containing text.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869395" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886498" 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>selected</fo:inline>
@@ -1688,7 +1760,7 @@ background of those areas of the document containing text.</fo:block>
selected (or highlighted) portions of the document.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869432" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886535" 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>found</fo:inline>
@@ -1700,7 +1772,7 @@ encountered as the result of a <fo:basic-link internal-destination="find">find</
operation.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869485" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886587" 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>selected + found</fo:inline>
@@ -1716,13 +1788,13 @@ the previous entry above but that has also been selected.</fo:block>
<fo:block id="pref-indent">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">indent</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">indent</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2869547" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2869554" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2886650" 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="id2886657" 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>auto indent</fo:inline>
@@ -1734,7 +1806,7 @@ new lines to begin with the same indentation level as the previous
line.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869590" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886693" 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>indent with spaces</fo:inline>
@@ -1747,7 +1819,7 @@ the <fo:basic-link internal-destination="pref-edit">edit</fo:basic-link> section
dialog.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869646" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886749" 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>backspace key indents</fo:inline>
@@ -1759,7 +1831,7 @@ backspace key to be used to
indent.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869698" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886800" 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>tab key indents</fo:inline>
@@ -1771,7 +1843,7 @@ allows the tab key to be used to
indent.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869749" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886852" 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>keep indent profile</fo:inline>
@@ -1782,7 +1854,7 @@ indent.</fo:block>
retains current indentation settings for future documents.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869785" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2886887" 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>keep extra spaces</fo:inline>
@@ -1798,13 +1870,13 @@ will not be shortened.</fo:block>
<fo:block id="pref-select">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">select</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">select</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2869847" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2869854" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2886950" 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="id2886957" 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>persistent selections</fo:inline>
@@ -1814,15 +1886,15 @@ will not be shortened.</fo:block>
<fo:block>this prevents key input or cursor movement by way of the
arrow keys from causing the elimination of text
selection. </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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2886990">
+ <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: if the overwrite selections option is
activated then any typed character input or paste operation will replace
the selected text.)</fo:block>
</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869909" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887012" 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>overwrite selections</fo:inline>
@@ -1833,7 +1905,7 @@ the selected text.)</fo:block>
the selected text. </fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869946" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887048" 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>mouse autocopy</fo:inline>
@@ -1845,7 +1917,7 @@ selected with the mouse will be automatically copied to the
clipboard.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2869982" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887085" 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>x11-like single selection</fo:inline>
@@ -1855,7 +1927,7 @@ clipboard.</fo:block>
<fo:block>not implemented yet.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870017" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887120" 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>vertical selections</fo:inline>
@@ -1867,7 +1939,7 @@ activates the <fo:basic-link internal-destination="vertical-selection">vertical
option.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870073" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887176" 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>toggle old</fo:inline>
@@ -1882,13 +1954,13 @@ option.</fo:block>
<fo:block id="pref-edit">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">edit</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">edit</fo:block>
</fo:block>
</fo:block>
</fo:block>
- <fo:list-block id="id2870131" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2870137" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2887234" 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="id2887240" 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>word wrap</fo:inline>
@@ -1902,7 +1974,7 @@ when the current line reaches the length specified by the <fo:basic-link intern
option.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870214" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887317" 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>wrap words
@@ -1915,7 +1987,7 @@ determines the length (in characters) at which the editor will
automatically start a new line.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870280" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887382" 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>replace tabs by
@@ -1927,7 +1999,7 @@ spaces</fo:inline>
with the number of spaces indicated in the <fo:basic-link internal-destination="pref-tab-width">tab width:</fo:basic-link> entry.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870351" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887454" 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>tab width</fo:inline>
@@ -1939,7 +2011,7 @@ option is selected this entry determines the number of spaces with which
the editor will automatically replace tabs.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870415" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887518" 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>remove trailing spaces</fo:inline>
@@ -1950,7 +2022,7 @@ the editor will automatically replace tabs.</fo:block>
ends of lines of text.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870456" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887559" 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>auto brackets</fo:inline>
@@ -1963,7 +2035,7 @@ enters the right bracket (}, ), or ]) to the right of the
cursor.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870501" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887604" 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>group undos</fo:inline>
@@ -1990,7 +2062,7 @@ button would only remove the last three letters typed, or the last three
operations.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870605" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887708" 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>show tabs</fo:inline>
@@ -2001,7 +2073,7 @@ operations.</fo:block>
of a tab in the text.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870641" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887744" 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>smart home</fo:inline>
@@ -2011,7 +2083,7 @@ of a tab in the text.</fo:block>
<fo:block>not yet implemented</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870676" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887778" 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>page up/down moves cursor</fo:inline>
@@ -2028,7 +2100,7 @@ option selected, the first key press will cause the cursor to move to either the
or bottom of the visible text as a new page of text is displayed.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870744" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887847" 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>wrap cursor</fo:inline>
@@ -2045,7 +2117,7 @@ horizontally in the same line and trying to move it left past the beginning
does nothing.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870785" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2887888" 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:basic-link internal-destination="undo">undo</fo:basic-link> steps:</fo:inline>
@@ -2066,8 +2138,8 @@ button 10 times and obtain results.</fo:block>
<fo:block id="prefspellchecker">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">spelling</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">spelling</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -2075,8 +2147,8 @@ button 10 times and obtain results.</fo:block>
help the user catch and correct any spelling errors. this section of the
preferences dialog allows certain important settings to be adjusted in this
regard.</fo:block>
- <fo:list-block id="id2870906" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2870913" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888009" 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="id2888016" 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>create root/affix combinations not in
@@ -2090,7 +2162,7 @@ suffixes or prefixes even if the particular combination is not listed in
its dictionary data base of words.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870952" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888055" 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>consider run-together words as spelling
@@ -2104,7 +2176,7 @@ words that are 'run-together', i.e., that do not have spaces
separating them.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2870999" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888101" 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>dictionary:</fo:inline>
@@ -2117,7 +2189,7 @@ dictionaries may be available. this drop down box allows the user to
choose which language the spell checker should use.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871037" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888140" 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>encoding:</fo:inline>
@@ -2131,7 +2203,7 @@ this drop down box allows this code to be specified so that the spell
checker can do its job correctly. </fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871076" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888179" 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>client:</fo:inline>
@@ -2151,7 +2223,7 @@ use.</fo:block>
<fo:page-sequence id="pref-highlighting" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">5. highlighting</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 5. highlighting</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -2162,7 +2234,7 @@ use.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 5. highlighting</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 5. highlighting</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">the configure highlighting dialog consists of two
@@ -2171,8 +2243,8 @@ modes. the user can select which page to view by clicking on the
appropriate tab at the top of the dialog</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">items available on the defaults page are as
follows:</fo:block>
- <fo:list-block id="id2871201" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2871208" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888304" 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="id2888310" 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>default item styles</fo:inline>
@@ -2184,8 +2256,8 @@ this would allow a programmer to more easily identify different items (types of
entries) in his or her code.
</fo:block>
- <fo:list-block id="id2871242" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2871249" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888345" 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="id2888352" 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>item</fo:inline>
@@ -2201,7 +2273,7 @@ selected as needed. the options in the rest of this section apply
to the entry selected in this box.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871321" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888424" 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>normal</fo:inline>
@@ -2213,7 +2285,7 @@ to the entry selected in this box.</fo:block>
dialog box, a further explanation of which may be found in the <fo:basic-link internal-destination="prefcolors">colors</fo:basic-link> section of <fo:basic-link internal-destination="pref-dialog">configure kwrite</fo:basic-link>.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871394" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888497" 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>bold</fo:inline>
@@ -2224,7 +2296,7 @@ dialog box, a further explanation of which may be found in the <fo:basic-link in
bold text.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871430" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888533" 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>italic</fo:inline>
@@ -2235,7 +2307,7 @@ bold text.</fo:block>
text.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871466" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888569" 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>selected</fo:inline>
@@ -2250,7 +2322,7 @@ dialog box, a further explanation of which may be found in the <fo:basic-link in
</fo:list-block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871540" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888643" 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>default font</fo:inline>
@@ -2259,8 +2331,8 @@ dialog box, a further explanation of which may be found in the <fo:basic-link in
<fo:list-item-body start-indent="body-start()">
<fo:block>here the user can choose the default font for all
text.</fo:block>
- <fo:list-block id="id2871573" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2871579" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888676" 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="id2888682" 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>family</fo:inline>
@@ -2272,7 +2344,7 @@ for most programming purposes, a monospaced font (one in which a w takes up the
amount of space as an i) may be the best choice.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871618" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888720" 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>size</fo:inline>
@@ -2283,7 +2355,7 @@ amount of space as an i) may be the best choice.</fo:block>
points.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871653" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888756" 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>charset</fo:inline>
@@ -2302,8 +2374,8 @@ more specific highlighting depending on the language style.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">one need not set every available option, items not configured
specifically will use the default configuration specified on the previous
(defaults tab.</fo:block>
- <fo:list-block id="id2871731" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2871738" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888834" 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="id2888840" 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>config select</fo:inline>
@@ -2313,8 +2385,8 @@ specifically will use the default configuration specified on the previous
<fo:block>this group of options is used to customize the highlighting styles
for each programming language type. any changes you made in
other areas of this dialog apply only to this type.</fo:block>
- <fo:list-block id="id2871772" provisional-distance-between-starts="3in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2871779" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2888875" 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="id2888882" 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>highlight</fo:inline>
@@ -2325,7 +2397,7 @@ other areas of this dialog apply only to this type.</fo:block>
configure</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871814" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2888917" 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>item</fo:inline>
@@ -2348,7 +2420,7 @@ defaults page of this dialog box while leaving
highlight modes page.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2871940" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2889042" 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>item style</fo:inline>
@@ -2364,7 +2436,7 @@ selected, bold and
italic.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2872026" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2889129" 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>highlight auto select</fo:inline>
@@ -2376,11 +2448,11 @@ on the file extension or mime-type of the opened file. the defaults are fairly
comprehensive, but users that regularly edit files with non-standard extensions
can add them here. wildcards are allowed in the file
extensions text box. for example, the default entry for the c++
-language is <fo:inline font-weight="bold" font-family="monospace">*.cpp;*.cc;*.c;*.h</fo:inline>. opening a file called
-<fo:inline font-family="monospace">foo.h</fo:inline> would automatically apply the c++ style to it.</fo:block>
+language is <fo:inline font-weight="bold" font-family="Courier">*.cpp;*.cc;*.c;*.h</fo:inline>. opening a file called
+<fo:inline font-family="Courier">foo.h</fo:inline> would automatically apply the c++ style to it.</fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2872097" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2889200" 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>item font</fo:inline>
@@ -2401,7 +2473,7 @@ the defaults tab.</fo:block>
<fo:page-sequence id="credits" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">6. credits and licenses</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 6. credits and licenses</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -2412,51 +2484,51 @@ the defaults tab.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 6. credits and licenses</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 6. credits and licenses</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">kwrite copyright 2000 by jochen wilhelmy
-<fo:inline font-family="monospace">&lt;digisnap@cs.tu-berlin.de&gt;</fo:inline></fo:block>
+<fo:inline font-family="Courier">&lt;digisnap@cs.tu-berlin.de&gt;</fo:inline></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">contributions:</fo:block>
- <fo:list-block id="id2872236" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2872243" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-block id="id2889339" 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="id2889345" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>additional contributions by glen parker <fo:inline font-family="monospace">&lt;glenebob@nwlink.com&gt;</fo:inline></fo:block>
+ <fo:block>additional contributions by glen parker <fo:inline font-family="Courier">&lt;glenebob@nwlink.com&gt;</fo:inline></fo:block>
</fo:list-item-body>
</fo:list-item>
- <fo:list-item id="id2872264" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item id="id2889367" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>michael koch <fo:inline font-family="monospace">&lt;koch@kde.org&gt;</fo:inline></fo:block>
+ <fo:block>michael koch <fo:inline font-family="Courier">&lt;koch@kde.org&gt;</fo:inline></fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">documentation by thad mcginnis <fo:inline font-family="monospace">&lt;ctmcginnis@compuserve.com&gt;</fo:inline></fo:block>
- <fo:list-block id="id2872302" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
- <fo:list-item id="id2872308" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">documentation by thad mcginnis <fo:inline font-family="Courier">&lt;ctmcginnis@compuserve.com&gt;</fo:inline></fo:block>
+ <fo:list-block id="id2889405" 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="id2889411" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:list-item-label end-indent="label-end()">
<fo:block>&#x2022;</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>this version of the kwrite handbook is based on the original by cristian tibirna <fo:inline font-family="monospace">&lt;tibirna@kde.org&gt;</fo:inline></fo:block>
+ <fo:block>this version of the kwrite handbook is based on the original by cristian tibirna <fo:inline font-family="Courier">&lt;tibirna@kde.org&gt;</fo:inline></fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">converted to docbook/proofreading by lauri watts <fo:inline font-family="monospace">&lt;vampyr@atconnex.net&gt;</fo:inline></fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">converted to docbook/proofreading by lauri watts <fo:inline font-family="Courier">&lt;vampyr@atconnex.net&gt;</fo:inline></fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">this documentation is licensed under the terms of the <fo:basic-link external-destination="common/fdl-license.html">gnu free documentation
-license</fo:basic-link> [common/fdl-license.html].</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">this program is licensed under the terms of the <fo:basic-link external-destination="common/gpl-translated.html">gnu general public license</fo:basic-link> [common/gpl-translated.html].</fo:block>
+license</fo:basic-link><fo:inline hyphenate="false"> [common/fdl-license.html]</fo:inline>.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">this program is licensed under the terms of the <fo:basic-link external-destination="common/gpl-translated.html">gnu general public license</fo:basic-link><fo:inline hyphenate="false"> [common/gpl-translated.html]</fo:inline>.</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="installation" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. installation</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. installation</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -2467,11 +2539,11 @@ license</fo:basic-link> [common/fdl-license.html].</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. installation</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. installation</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">kwrite is packaged as part of the kdebase package. for more information
-on installing and compiling kde please see <fo:basic-link external-destination="http://www.kde.org">www.kde.org</fo:basic-link> [http://www.kde.org].</fo:block>
+on installing and compiling kde please see <fo:basic-link external-destination="http://www.kde.org">www.kde.org</fo:basic-link><fo:inline hyphenate="false"> [http://www.kde.org]</fo:inline>.</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
diff --git a/tests/docbook/result/fo/multilingual.fo b/tests/docbook/result/fo/multilingual.fo
index 98ae996e..185ab71f 100644
--- a/tests/docbook/result/fo/multilingual.fo
+++ b/tests/docbook/result/fo/multilingual.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2787333" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2804432" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Multilingual Test Document</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Multilingual Test Document</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,38 +97,101 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.Catalan<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="cachap"/></fo:block>
- <fo:block>2.Czech<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="cschap"/></fo:block>
- <fo:block>3.Danish<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="dachap"/></fo:block>
- <fo:block>4.Spanish<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="eschap"/></fo:block>
- <fo:block>5.Finnish<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="fichap"/></fo:block>
- <fo:block>6.French<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="frchap"/></fo:block>
- <fo:block>7.Italian<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="itchap"/></fo:block>
- <fo:block>8.German<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="dechap"/></fo:block>
- <fo:block>9.Greek<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="elchap"/></fo:block>
- <fo:block>10.English<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="enchap"/></fo:block>
- <fo:block>11.Japanese<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="jachap"/></fo:block>
- <fo:block>12.Romanian<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="rochap"/></fo:block>
- <fo:block>13.Russian<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="ruchap"/></fo:block>
- <fo:block>14.Norsk<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="nochap"/></fo:block>
- <fo:block>15.Dutch<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="nlchap"/></fo:block>
- <fo:block>16.Polish<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="plchap"/></fo:block>
- <fo:block>17.Portuguese<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="ptchap"/></fo:block>
- <fo:block>18.Portuguese (Brazilian)<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="ptbrchap"/></fo:block>
- <fo:block>19.Slovak<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="skchap"/></fo:block>
- <fo:block>20.Swedish<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="svchap"/></fo:block>
- <fo:block>Bibliography<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="bibl"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 Catalan</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="cachap"><fo:page-number-citation ref-id="cachap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">2 Czech</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="cschap"><fo:page-number-citation ref-id="cschap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">3 Danish</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="dachap"><fo:page-number-citation ref-id="dachap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">4 Spanish</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="eschap"><fo:page-number-citation ref-id="eschap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">5 Finnish</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="fichap"><fo:page-number-citation ref-id="fichap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">6 French</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="frchap"><fo:page-number-citation ref-id="frchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">7 Italian</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="itchap"><fo:page-number-citation ref-id="itchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">8 German</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="dechap"><fo:page-number-citation ref-id="dechap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">9 Greek</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="elchap"><fo:page-number-citation ref-id="elchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">10 English</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="enchap"><fo:page-number-citation ref-id="enchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">11 Japanese</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="jachap"><fo:page-number-citation ref-id="jachap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">12 Romanian</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="rochap"><fo:page-number-citation ref-id="rochap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">13 Russian</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="ruchap"><fo:page-number-citation ref-id="ruchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">14 Norsk</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="nochap"><fo:page-number-citation ref-id="nochap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">15 Dutch</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="nlchap"><fo:page-number-citation ref-id="nlchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">16 Polish</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="plchap"><fo:page-number-citation ref-id="plchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">17 Portuguese</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="ptchap"><fo:page-number-citation ref-id="ptchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">18 Portuguese (Brazilian)</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="ptbrchap"><fo:page-number-citation ref-id="ptbrchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">19 Slovak</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="skchap"><fo:page-number-citation ref-id="skchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">20 Swedish</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="svchap"><fo:page-number-citation ref-id="svchap"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Bibliography</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="bibl"><fo:page-number-citation ref-id="bibl"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="cachap" hyphenate="true" master-name="oneside1" language="ca" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Catalan</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Cap&#xED;tol 1. Catalan</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -139,45 +202,45 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Cap&#xED;tol 1. Catalan</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tol 1. Catalan</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTA</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="id2763122">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Catalan, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="cschap" hyphenate="true" master-name="oneside1" language="cs">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">2. Czech</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapitola 2. Czech</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -188,45 +251,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapitola 2. Czech</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitola 2. Czech</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Pozn&#xE1;mka</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="id2804565">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Pozn&#xE1;mka</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Czech, if I knew any.
&#x201E;Quote test.&#x201C;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="dachap" hyphenate="true" master-name="oneside1" language="da">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">3. Danish</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapitel 3. Danish</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -237,45 +300,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapitel 3. Danish</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 3. Danish</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTE</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="id2759145">
+ <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">
This paragraph would be in Danish, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="eschap" hyphenate="true" master-name="oneside1" language="es">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">4. Spanish</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Cap&#xED;tulo 4. Spanish</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -286,45 +349,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Cap&#xED;tulo 4. Spanish</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 4. Spanish</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTA</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="id2759546">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Spanish, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="fichap" hyphenate="true" master-name="oneside1" language="fi">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">5. Finnish</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Luku 5. Finnish</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -335,45 +398,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Luku 5. Finnish</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Luku 5. Finnish</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">HUOMAA</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="id2757964">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Huomaa</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Finnish, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="frchap" hyphenate="true" master-name="oneside1" language="fr">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">6. French</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapitre 6. French</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -384,45 +447,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapitre 6. French</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapitre 6. French</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2758398">
+ <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">
This paragraph would be in French, if I knew any.
&#xAB;Quote test.&#xBB;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="itchap" hyphenate="true" master-name="oneside1" language="it">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">7. Italian</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Capitolo 7. Italian</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -433,45 +496,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Capitolo 7. Italian</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Capitolo 7. Italian</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTA</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="id2758831">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Italian, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="dechap" hyphenate="true" master-name="oneside1" language="de">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">8. German</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapitel 8. German</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -482,45 +545,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapitel 8. German</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 8. German</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Anmerkung</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="id2868367">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Anmerkung</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in German, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="elchap" hyphenate="true" master-name="oneside1" language="el">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">9. Greek</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -531,45 +594,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">&#xD3;&#xC7;&#xCC;&#xC5;&#xC9;&#xD9;&#xD3;&#xC7;</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="id2868698">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#xD3;&#xE7;&#xEC;&#xE5;&#xDF;&#xF9;&#xF3;&#xE7;</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Greek, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="enchap" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">10. English</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 10. English</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -580,45 +643,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 10. English</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 10. English</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">Note</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="id2869030">
+ <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">
This paragraph is in English.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="jachap" hyphenate="true" master-name="oneside1" language="ja">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">11. Japanese</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">&#x7B2C;11&#x7AE0;</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -629,45 +692,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>&#x7AE0; 11. Japanese</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">&#x7B2C;11&#x7AE0;</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">&#x6CE8;&#x610F;</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="id2869370">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#x6CE8;&#x610F;</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Japanese, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="rochap" hyphenate="true" master-name="oneside1" language="ro">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">12. Romanian</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Cap. 12. Romanian</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -678,45 +741,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Cap. 12. Romanian</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Cap. 12. Romanian</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOT&#xC3;</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="id2869710">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Not&#xE3;</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Romanian, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="ruchap" hyphenate="true" master-name="oneside1" language="ru">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">13. Russian</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -727,45 +790,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">&#x417;&#x410;&#x41C;&#x415;&#x427;&#x410;&#x41D;&#x418;&#x415;</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="id2870049">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#x417;&#x430;&#x43C;&#x435;&#x447;&#x430;&#x43D;&#x438;&#x435;</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Russian, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="nochap" hyphenate="true" master-name="oneside1" language="no">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">14. Norsk</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapittel 14. Norsk</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -776,45 +839,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapittel 14. Norsk</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapittel 14. Norsk</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTAT</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="id2870388">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Notat</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Norsk, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="nlchap" hyphenate="true" master-name="oneside1" language="nl">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">15. Dutch</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Hoofdstuk 15. Dutch</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -825,45 +888,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Hoofdstuk 15. Dutch</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Hoofdstuk 15. Dutch</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">N.B.</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="id2870728">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Opmerking</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Dutch, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="plchap" hyphenate="true" master-name="oneside1" language="pl">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">16. Polish</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Rozdzia&#x142; 16. Polish</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -874,45 +937,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Rozdzia&#xB3; 16. Polish</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Rozdzia&#x142; 16. Polish</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTATKA</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="id2871067">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Notatka</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Polish, if I knew any.
-&#x201C;Quote test.&#x201D;
+&#x201E;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="ptchap" hyphenate="true" master-name="oneside1" language="pt">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">17. Portuguese</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Cap&#xED;tulo 17. Portuguese</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -923,45 +986,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Cap&#xED;tulo 17. Portuguese</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 17. Portuguese</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTA</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="id2871406">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="ptbrchap" hyphenate="true" master-name="oneside1" language="pt_br">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">18. Portuguese (Brazilian)</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -972,45 +1035,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 18. Portuguese (Brazilian)</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOTA</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="id2871746">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Brazilian Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="skchap" hyphenate="true" master-name="oneside1" language="sk">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">19. Slovak</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapitola 19. Slovak</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1021,45 +1084,45 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapitola 19. Slovak</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitola 19. Slovak</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">POZN&#xC1;MKA</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="id2872086">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Pozn&#xE1;mka</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Slovak, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="svchap" hyphenate="true" master-name="oneside1" language="sv">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">20. Swedish</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Kapitel 20. Swedish</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -1070,38 +1133,38 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Kapitel 20. Swedish</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 20. Swedish</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">
- <fo:block font-size="14pt" font-weight="bold" keep-with-next="true">NOT</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="id2872425">
+ <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Not</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
This paragraph would be in Swedish, if I knew any.
&#x201C;Quote test.&#x201D;
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1., <fo:inline font-style="italic">Catalan</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="cschap">Kapitola 2., <fo:inline font-style="italic">Czech</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dachap">Kapitel 3., <fo:inline font-style="italic">Danish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="dechap">Kapitel 8., <fo:inline font-style="italic">German</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9., <fo:inline font-style="italic">Greek</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="enchap">Chapter 10., <fo:inline font-style="italic">English</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4., <fo:inline font-style="italic">Spanish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="fichap">Luku 5., <fo:inline font-style="italic">Finnish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="frchap">Chapitre 6., <fo:inline font-style="italic">French</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="itchap">Capitolo 7., <fo:inline font-style="italic">Italian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="jachap">&#x7AE0; 11., <fo:inline font-style="italic">Japanese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15., <fo:inline font-style="italic">Dutch</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="nochap">Kapittel 14., <fo:inline font-style="italic">Norsk</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="plchap">Rozdzia&#xB3; 16., <fo:inline font-style="italic">Polish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17., <fo:inline font-style="italic">Portuguese</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18., <fo:inline font-style="italic">Portuguese (Brazilian)</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="rochap">Cap. 12., <fo:inline font-style="italic">Romanian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <fo:inline font-style="italic">Russian</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="skchap">Kapitola 19., <fo:inline font-style="italic">Slovak</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="svchap">Kapitel 20., <fo:inline font-style="italic">Swedish</fo:inline></fo:basic-link>.
-See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:basic-link>.
+See <fo:basic-link internal-destination="cachap">Cap&#xED;tol 1. Catalan</fo:basic-link>.
+See <fo:basic-link internal-destination="cschap">2 &#x2013; &#x201E;Czech&#x201C;</fo:basic-link>.
+See <fo:basic-link internal-destination="dachap">Kapitel 3. Danish</fo:basic-link>.
+See <fo:basic-link internal-destination="dechap">Kapitel 8. German</fo:basic-link>.
+See <fo:basic-link internal-destination="elchap">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:basic-link>.
+See <fo:basic-link internal-destination="enchap">Chapter 10. English</fo:basic-link>.
+See <fo:basic-link internal-destination="eschap">Cap&#xED;tulo 4. Spanish</fo:basic-link>.
+See <fo:basic-link internal-destination="fichap">Luku 5. Finnish</fo:basic-link>.
+See <fo:basic-link internal-destination="frchap">Chapitre 6. French</fo:basic-link>.
+See <fo:basic-link internal-destination="itchap">Capitolo 7. Italian</fo:basic-link>.
+See <fo:basic-link internal-destination="jachap">&#x7B2C;11&#x7AE0;</fo:basic-link>.
+See <fo:basic-link internal-destination="nlchap">Hoofdstuk 15. Dutch</fo:basic-link>.
+See <fo:basic-link internal-destination="nochap">Kapittel 14. Norsk</fo:basic-link>.
+See <fo:basic-link internal-destination="plchap">Rozdzia&#x142; 16. Polish</fo:basic-link>.
+See <fo:basic-link internal-destination="ptchap">Cap&#xED;tulo 17. Portuguese</fo:basic-link>.
+See <fo:basic-link internal-destination="ptbrchap">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:basic-link>.
+See <fo:basic-link internal-destination="rochap">Cap. 12. Romanian</fo:basic-link>.
+See <fo:basic-link internal-destination="ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:basic-link>.
+See <fo:basic-link internal-destination="skchap">Kapitola 19. Slovak</fo:basic-link>.
+See <fo:basic-link internal-destination="svchap">Kapitel 20. Swedish</fo:basic-link>.
+See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -1114,12 +1177,12 @@ See <fo:basic-link internal-destination="bibl">&#x201C;Bibliography&#x201D;</fo:
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Bibliography</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Bibliography</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2855649">
+ <fo:block id="id2872740" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
<fo:inline>[AhoSethiUllman96] </fo:inline>
- <fo:inline>Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
+ <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
<fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
<fo:inline>
<fo:inline>Addison-Wesley Publishing Company. </fo:inline>
diff --git a/tests/docbook/result/fo/qa.fo b/tests/docbook/result/fo/qa.fo
index bf634e1f..21e4adbd 100644
--- a/tests/docbook/result/fo/qa.fo
+++ b/tests/docbook/result/fo/qa.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2739621" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2755367" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>book title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">book title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,25 +97,37 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.chapter test<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2745472"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 chapter test</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762571"><fo:page-number-citation ref-id="id2762571"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>Section title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2742253"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Section title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759342"><fo:page-number-citation ref-id="id2759342"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A appendix test</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758225"><fo:page-number-citation ref-id="id2758225"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A.appendix test<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741129"/></fo:block>
<fo:block start-indent="2pc">
- <fo:block>Section title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2851472"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Section title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2868578"><fo:page-number-citation ref-id="id2868578"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2745472" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2762571" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. chapter test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. chapter test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -126,32 +138,656 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. chapter test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. chapter test</fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2762581">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (unspecified)</title>
+ </fo:block>
+ <fo:block id="id2760849">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2760858" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2760864" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2760858" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2760891" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2760924">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2760934" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2760939" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2760934" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2760963" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2760988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2760993" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2760988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2761017" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2761054">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (none)</title>
+ </fo:block>
+ <fo:block id="id2761074">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2761084" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2761090" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2761084" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868066" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2804599">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2804610" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2804615" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2804610" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2804638" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2804522" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2804527" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2804522" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2804550" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
</fo:block>
</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (unspecified)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (none)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (number)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (qanda)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block id="id2742253">
+ <fo:block id="id2762606">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (number)</title>
+ </fo:block>
+ <fo:block id="id2762626">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2762637" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2762642" end-indent="label-end()">
+ <fo:block>1.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2762637" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2762670" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758990">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759000" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759005" end-indent="label-end()">
+ <fo:block>2.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759000" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759028" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759054" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759059" end-indent="label-end()">
+ <fo:block>2.2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759054" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759082" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759119">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (qanda)</title>
+ </fo:block>
+ <fo:block id="id2759140">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759155" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759184" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759217">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759227" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759232" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759227" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759256" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759281" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759286" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759281" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759310" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759342">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section title</fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759354">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (unspecified)</title>
+ </fo:block>
+ <fo:block id="id2759366">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759377" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759382" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759377" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759410" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759443">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759454" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759459" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759454" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759482" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759508" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759513" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759508" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759536" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2759573">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (none)</title>
+ </fo:block>
+ <fo:block id="id2759594">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2759604" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759609" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2759604" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2759114" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2757642">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2757652" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757657" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757652" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757680" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757706" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757711" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757706" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757734" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2757771">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (number)</title>
+ </fo:block>
+ <fo:block id="id2757792">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2757802" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757807" end-indent="label-end()">
+ <fo:block>1.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757802" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757836" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2757869">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2757879" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757884" end-indent="label-end()">
+ <fo:block>2.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757879" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757908" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757933" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757938" end-indent="label-end()">
+ <fo:block>2.2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2757933" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757962" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2757999">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (qanda)</title>
+ </fo:block>
+ <fo:block id="id2758020">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758030" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758035" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758030" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758064" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758097">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758107" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758112" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758107" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758136" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758161" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758166" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758161" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758190" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (unspecified)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (none)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (number)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (qanda)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2741129" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2758225" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. appendix test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. appendix test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -162,25 +798,649 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. appendix test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. appendix test</fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758237">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (unspecified)</title>
+ </fo:block>
+ <fo:block id="id2758250">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758260" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758265" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758260" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758293" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758327">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758337" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758342" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758337" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758365" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758391" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758396" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758391" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758419" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758456">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (none)</title>
+ </fo:block>
+ <fo:block id="id2758477">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758487" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758492" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758487" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758520" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758554">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758564" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758569" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758564" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758592" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758618" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758623" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758618" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758646" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758684">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (number)</title>
+ </fo:block>
+ <fo:block id="id2758705">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758715" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758720" end-indent="label-end()">
+ <fo:block>1.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758715" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758748" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2758782">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2758792" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758797" end-indent="label-end()">
+ <fo:block>2.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758792" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758820" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758846" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758851" end-indent="label-end()">
+ <fo:block>2.2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2758846" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2757767" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868364">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (qanda)</title>
+ </fo:block>
+ <fo:block id="id2868377">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868388" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868393" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868388" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868421" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868454">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868464" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868470" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868464" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868493" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868518" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868524" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868518" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868547" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
</fo:block>
</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (unspecified)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (none)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (number)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (qanda)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block id="id2851472">
+ <fo:block id="id2868578">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section title</fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868590">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (unspecified)</title>
+ </fo:block>
+ <fo:block id="id2868603">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868613" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868618" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868613" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868647" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868680">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868690" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868695" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868690" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868718" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868744" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868749" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868744" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868772" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868809">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (none)</title>
+ </fo:block>
+ <fo:block id="id2868822">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868833" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868838" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868833" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868866" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2868899">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2868910" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868915" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868910" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868938" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868964" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868969" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2868964" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2868992" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2869029">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (number)</title>
+ </fo:block>
+ <fo:block id="id2869042">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2869052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869057" end-indent="label-end()">
+ <fo:block>1.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869086" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2869119">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2869129" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869134" end-indent="label-end()">
+ <fo:block>2.1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869129" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869157" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869183" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869188" end-indent="label-end()">
+ <fo:block>2.2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869183" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869211" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2869248">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (qanda)</title>
+ </fo:block>
+ <fo:block id="id2869261">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2869272" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869277" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869272" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869305" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2869338">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2869349" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869354" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869349" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869377" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869403" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869408" end-indent="label-end()">
+ <fo:block>Q:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2869403" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2869431" end-indent="label-end()">
+ <fo:block></fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
</fo:block>
</fo:block>
</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (unspecified)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (none)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (number)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (qanda)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
diff --git a/tests/docbook/result/fo/qa2.fo b/tests/docbook/result/fo/qa2.fo
index 9e6b1998..205ce490 100644
--- a/tests/docbook/result/fo/qa2.fo
+++ b/tests/docbook/result/fo/qa2.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,11 +81,11 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599706" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2755367" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>book title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">book title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,18 +97,21 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.chapter test<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2745559"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 chapter test</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759019"><fo:page-number-citation ref-id="id2759019"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2745559" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+ <fo:page-sequence id="id2759019" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. chapter test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. chapter test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -119,12 +122,90 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. chapter test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. chapter test</fo:block>
</fo:block>
</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Test a cross reference to a question: <fo:basic-link internal-destination="q1">Q: <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>.</fo:basic-link>.
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Test a cross reference to a question: <fo:basic-link internal-destination="q1">Q: <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block></fo:basic-link>.
</fo:block>
- <fo:block color="red">&lt;qandaset&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Set (unspecified)&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 1&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block><fo:block color="red">&lt;qandadiv&gt;<fo:block color="red">&lt;title&gt;Q&amp;A Div 2&lt;/title&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block><fo:block color="red">&lt;qandaentry&gt;<fo:block color="red">&lt;question&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>&lt;/question&gt;</fo:block><fo:block color="red">&lt;answer&gt;<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>&lt;/answer&gt;</fo:block>&lt;/qandaentry&gt;</fo:block>&lt;/qandadiv&gt;</fo:block>&lt;/qandaset&gt;</fo:block>
+ <fo:block id="id2759157">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Set (unspecified)</title>
+ </fo:block>
+ <fo:block id="id2761713">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 1</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2761725" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="q1" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2761725" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="a1" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block color="red">&lt;label&gt;A1&lt;/label&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ <fo:block id="id2761916">
+ <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
+ <title>Q&amp;A Div 2</title>
+ </fo:block>
+ <fo:block start-indent="0pc">
+ <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
+ <fo:list-item id="id2761928" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2761934" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2761928" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2761958" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2853703" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758763" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item id="id2853703" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+ <fo:list-item-label id="id2758787" end-indent="label-end()">
+ <fo:block/>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 1</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
diff --git a/tests/docbook/result/fo/sectest.fo b/tests/docbook/result/fo/sectest.fo
index 1436c347..d14082cf 100644
--- a/tests/docbook/result/fo/sectest.fo
+++ b/tests/docbook/result/fo/sectest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" keep-with-next="always" space-before="2in">Some Corporation</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="17.28pt" text-align="center" space-before="10.8pt" keep-with-next="always">Norman Walsh</fo:block>
@@ -99,10 +99,10 @@
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
</fo:block>
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 by Norman Walsh</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Copyright &#xA9; 1998 Norman Walsh</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt">
<fo:block>
- <fo:block font-weight="bold" font-size="12pt">Legal Notice</fo:block>
+ <fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Legal Notice</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test document. You can do what you will with it.</fo:block>
</fo:block>
</fo:block>
@@ -125,20 +125,32 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Preface Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2850875"/></fo:block>
- <fo:block>1.XRef Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Preface Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2867983"><fo:page-number-citation ref-id="id2867983"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 XRef Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
<fo:block start-indent="2pc">
- <fo:block>Section 1 Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741985"/></fo:block>
- <fo:block>Section 1 Title<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2741287"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Section 1 Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759009"><fo:page-number-citation ref-id="id2759009"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Section 1 Title</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2758342"><fo:page-number-citation ref-id="id2758342"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2850817" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2762723" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -147,7 +159,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Dedication</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Dedication</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This test book is dedicated to all the testers. This is the first para
@@ -156,7 +168,7 @@ of the dedication.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the dedication.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2850875" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2867983" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -165,7 +177,7 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Preface Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Preface Title</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Preface content.</fo:block>
@@ -176,7 +188,7 @@ of the dedication.</fo:block>
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. XRef Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -187,18 +199,16 @@ of the dedication.</fo:block>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. XRef Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. XRef Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block font-size="16pt" font-weight="bold">Xrefs</fo:block>
+ <fo:block font-size="12pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Xrefs</fo:block>
<fo:table>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="book">
- <fo:inline font-style="italic">Book Title</fo:inline>
- </fo:basic-link>
+ <fo:basic-link internal-destination="book">Book Title</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -210,7 +220,7 @@ of the dedication.</fo:block>
<fo:table-row>
<fo:table-cell>
<fo:block>
- <fo:basic-link internal-destination="chapter">Chapter 1., <fo:inline font-style="italic">XRef Tests</fo:inline></fo:basic-link>
+ <fo:basic-link internal-destination="chapter">Chapter 1. XRef Tests</fo:basic-link>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -321,11 +331,11 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
</fo:block>
- <fo:block id="id2741985">
+ <fo:block id="id2759009">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section 1 Title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section 1 Title</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -798,11 +808,11 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
</fo:block>
</fo:block>
- <fo:block id="id2741287">
+ <fo:block id="id2758342">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section 1 Title</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Section 1 Title</fo:block>
</fo:block>
</fo:block>
</fo:block>
diff --git a/tests/docbook/result/fo/set.fo b/tests/docbook/result/fo/set.fo
index 733b4039..1d315bc0 100644
--- a/tests/docbook/result/fo/set.fo
+++ b/tests/docbook/result/fo/set.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,20 +81,20 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2745329" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2753077" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Set Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Set Title</fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2745338" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2762440" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -102,7 +102,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
@@ -113,27 +113,54 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2745393"/></fo:block>
- <fo:block>1.Section Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="chapter"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>First Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2850749"/></fo:block>
- <fo:block>Second Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2739531"/></fo:block>
- <fo:block>Third Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2850821"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762497"><fo:page-number-citation ref-id="id2762497"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787343"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>First Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787363"/></fo:block>
- <fo:block>Second Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787384"/></fo:block>
- <fo:block>Third Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2787404"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 Section Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="chapter"><fo:page-number-citation ref-id="chapter"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762634"><fo:page-number-citation ref-id="id2762634"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2867904"><fo:page-number-citation ref-id="id2867904"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2867927"><fo:page-number-citation ref-id="id2867927"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804450"><fo:page-number-citation ref-id="id2804450"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804469"><fo:page-number-citation ref-id="id2804469"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804490"><fo:page-number-citation ref-id="id2804490"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2804363"><fo:page-number-citation ref-id="id2804363"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2745393" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2762497" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -142,7 +169,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
@@ -151,7 +178,7 @@
<fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Section Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -162,34 +189,34 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Section Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2850749">
+ <fo:block id="id2762634">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2739531">
+ <fo:block id="id2867904">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2850821">
+ <fo:block id="id2867927">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -197,10 +224,10 @@
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787343" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2804450" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -211,35 +238,35 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
- <fo:block id="id2787363">
+ <fo:block id="id2804469">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2787384">
+ <fo:block id="id2804490">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2787404">
+ <fo:block id="id2804363">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -247,11 +274,11 @@
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2787285" hyphenate="true" master-name="titlepage1" language="en">
+ <fo:page-sequence id="id2804389" hyphenate="true" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Test Document Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Test Document Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="20.736pt" text-align="center" space-before="15.552pt">Book Subtitle</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="12pt" text-align="center" space-before="2in">
@@ -259,7 +286,7 @@
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Book Test Document Title: Book Subtitle</fo:block>
+ <fo:block>Bookinfo Test Document Title: Book Subtitle</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
<fo:block>by Norman Walsh</fo:block>
@@ -270,22 +297,40 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>Foreword<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743555"/></fo:block>
- <fo:block>1.Section Tests<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743576"/></fo:block>
- <fo:block start-indent="2pc">
- <fo:block>First Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743590"/></fo:block>
- <fo:block>Second Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743611"/></fo:block>
- <fo:block>Third Sect1<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743632"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2756020"><fo:page-number-citation ref-id="id2756020"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 Section Tests</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2756040"><fo:page-number-citation ref-id="id2756040"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block start-indent="4pc">
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2756054"><fo:page-number-citation ref-id="id2756054"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760651"><fo:page-number-citation ref-id="id2760651"/></fo:basic-link></fo:inline>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760672"><fo:page-number-citation ref-id="id2760672"/></fo:basic-link></fo:inline>
+ </fo:block>
+ </fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760695"><fo:page-number-citation ref-id="id2760695"/></fo:basic-link></fo:inline>
</fo:block>
- <fo:block>A.First Appendix<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="id2743655"/></fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2743555" hyphenate="true" format="i" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2756020" hyphenate="true" format="i" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -294,16 +339,16 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-family="Helvetica" font-weight="bold">
- <fo:block>Foreword</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2743576" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2756040" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. Section Tests</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -314,34 +359,34 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. Section Tests</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
</fo:block>
</fo:block>
- <fo:block id="id2743590">
+ <fo:block id="id2756054">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">First Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2743611">
+ <fo:block id="id2760651">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Second Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
</fo:block>
- <fo:block id="id2743632">
+ <fo:block id="id2760672">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
- <fo:block keep-with-next="always">
- <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
+ <fo:block keep-with-next.within-column="always">
+ <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Third Sect1</fo:block>
</fo:block>
</fo:block>
</fo:block>
@@ -349,10 +394,10 @@
</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence id="id2743655" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2760695" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">A. First Appendix</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -363,7 +408,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Appendix A. First Appendix</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Appendix A. First Appendix</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
diff --git a/tests/docbook/result/fo/table.fo b/tests/docbook/result/fo/table.fo
index 6da15398..4faddd61 100644
--- a/tests/docbook/result/fo/table.fo
+++ b/tests/docbook/result/fo/table.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -84,7 +84,7 @@
<fo:page-sequence id="ch1" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -95,19 +95,19 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. test</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">How many &#xB0; can you &#xA9;.</fo:block>
- <fo:table-and-caption id="id2744368" keep-together.within-column="always">
+ <fo:table-and-caption id="id2760658" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1.1. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table table-layout="fixed">
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(1.5)+2in"/>
- <fo:table-column column-number="3" column-width="proportional-column-width(2)+4pt"/>
- <fo:table-body>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="proportional-column-width(1.5)+2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="proportional-column-width(2)+4pt"/>
+ <fo:table-body border-top="0.5pt solid black " border-bottom="0.5pt solid black ">
<fo:table-row>
<fo:table-cell>
<fo:block>1</fo:block>
@@ -217,132 +217,132 @@
</fo:table-body>
</fo:table>
</fo:table-and-caption>
- <fo:table-and-caption id="id2787385" keep-together.within-column="always">
+ <fo:table-and-caption id="id2760695" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1.2. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table table-layout="fixed">
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(1.5)"/>
- <fo:table-column column-number="3" column-width="proportional-column-width(2)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="proportional-column-width(1.5)"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="proportional-column-width(2)"/>
<fo:table-body>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell number-rows-spanned="2">
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt" number-rows-spanned="2">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell number-columns-spanned="2">
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt" number-columns-spanned="2">
<fo:block>2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell number-columns-spanned="2">
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt" number-columns-spanned="2">
<fo:block>2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>1</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>2</fo:block>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell border-left="0.5pt solid black " padding-left="2pt" border-right="0.5pt solid black " padding-right="2pt" border-top="0.5pt solid black " padding-top="2pt" border-bottom="0.5pt solid black " padding-bottom="2pt">
<fo:block>3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:table-and-caption>
- <fo:table-and-caption id="id2741794" keep-together.within-column="always">
+ <fo:table-and-caption id="id2762608" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1.3. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1" column-width="2in"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3" column-width="3in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="3in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
@@ -453,14 +453,14 @@
</fo:table-body>
</fo:table>
</fo:table-and-caption>
- <fo:table-and-caption id="id2742216" keep-together.within-column="always">
+ <fo:table-and-caption id="id2759171" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
<fo:table-caption>
- <fo:block font-weight="bold">Table 1.4. A Table</fo:block>
+ <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
</fo:table-caption>
<fo:table>
- <fo:table-column column-number="1"/>
- <fo:table-column column-number="2" column-width="2in"/>
- <fo:table-column column-number="3" column-width="3in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="1"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="2" column-width="2in"/>
+ <fo:table-column xmlns:fo="http://www.w3.org/1999/XSL/Format" column-number="3" column-width="3in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
diff --git a/tests/docbook/result/fo/test.fo b/tests/docbook/result/fo/test.fo
index d75aeb69..fb546daa 100644
--- a/tests/docbook/result/fo/test.fo
+++ b/tests/docbook/result/fo/test.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -81,7 +81,7 @@
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
- <fo:page-sequence id="id2599688" hyphenate="true" master-name="oneside1" language="en">
+ <fo:page-sequence id="id2756088" hyphenate="true" master-name="oneside1" language="en">
<fo:static-content flow-name="xsl-region-after">
<fo:block text-align="center" font-size="10pt">
<fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -89,14 +89,14 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Article Title</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica">
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Article Title</fo:block>
</fo:block>
</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">This
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This
is With a line-annotation
a
- screen<fo:block color="red">&lt;co&gt;&lt;/co&gt;</fo:block>
+ screen<fo:inline id="foo">&#x2776;</fo:inline>
This
is With a line-annotation
a
@@ -105,8 +105,8 @@ This
is With a line-annotation
a
screen</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">What about <fo:basic-link internal-destination="foo"><fo:external-graphic src="../images/callouts/1.png"/></fo:basic-link>?</fo:block>
- <fo:block color="red">&lt;mediaobjectco&gt;<fo:block color="red">&lt;imageobjectco&gt;<fo:external-graphic src="file:http://maps.example.com/EARTH?USA?MA?AMHERST" content-width="auto" content-height="auto" width="auto" height="auto"/>&lt;/imageobjectco&gt;</fo:block>&lt;/mediaobjectco&gt;</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">What about <fo:basic-link internal-destination="foo">&#x2776;</fo:basic-link>?</fo:block>
+ <fo:block color="red">&lt;mediaobjectco&gt;<fo:external-graphic src="url(file:http://maps.example.com/EARTH?USA?MA?AMHERST)" content-width="auto" content-height="auto" width="auto" height="auto"/>&lt;/mediaobjectco&gt;</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
diff --git a/tests/docbook/result/fo/verbtest.fo b/tests/docbook/result/fo/verbtest.fo
index 36aad039..58f74080 100644
--- a/tests/docbook/result/fo/verbtest.fo
+++ b/tests/docbook/result/fo/verbtest.fo
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="10pt" text-align="justify">
<fo:layout-master-set>
<fo:simple-page-master master-name="blank" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
<fo:region-body margin-bottom="24pt" margin-top="24pt"/>
@@ -85,7 +85,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
- <fo:block>Book Title</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Book Title</fo:block>
</fo:block>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="14.4pt" font-weight="bold" font-family="Helvetica">
@@ -97,18 +97,21 @@
</fo:page-sequence>
<fo:page-sequence hyphenate="true" format="i" master-name="titlepage1" language="en">
<fo:flow flow-name="xsl-region-body">
- <fo:block>
+ <fo:block space-before.minimum="0.5em" space-before.optimum="1em" space-before.maximum="2em" space-after.minimum="0.5em" space-after.optimum="1em" space-after.maximum="2em">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" space-after="1em" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">Table of Contents</fo:block>
</fo:block>
- <fo:block>1.test<fo:leader leader-pattern="dots" text-align-last="justify"/><fo:page-number-citation ref-id="ch1"/></fo:block>
+ <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
+ <fo:inline keep-with-next.within-line="always">1 test</fo:inline>
+ <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="ch1"><fo:page-number-citation ref-id="ch1"/></fo:basic-link></fo:inline>
+ </fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
<fo:page-sequence id="ch1" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
<fo:static-content flow-name="xsl-region-before">
<fo:block text-align="center">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">1. test</fo:block>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. test</fo:block>
</fo:block>
</fo:static-content>
<fo:static-content flow-name="xsl-region-after">
@@ -119,13 +122,13 @@
<fo:flow flow-name="xsl-region-body">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-size="17.28pt" font-weight="bold" font-family="Helvetica">
- <fo:block>Chapter 1. test</fo:block>
+ <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. test</fo:block>
</fo:block>
</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">How many &#xB0; can you &#xA9;.</fo:block>
- <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">And what about <fo:basic-link internal-destination="ch1">Chapter 1., <fo:inline font-style="italic">test</fo:inline></fo:basic-link>.</fo:block>
+ <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">And what about <fo:basic-link internal-destination="ch1">Chapter 1. test</fo:basic-link>.</fo:block>
<fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">And what about ???.</fo:block>
- <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em">
+ <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">
This is a program
listing.
</fo:block>
diff --git a/tests/docbook/result/html/article.html b/tests/docbook/result/html/article.html
index 71052dd9..30e9f3a3 100644
--- a/tests/docbook/result/html/article.html
+++ b/tests/docbook/result/html/article.html
@@ -3,12 +3,12 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599532" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599532"></a>Article Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2778647"></a>Article Test Document Title</h2></div>
<div>
<h3 class="corpauthor">nwalsh</h3>
<h3 class="author">Norman Walsh</h3>
@@ -17,11 +17,11 @@
<h3 class="editor">Someother Editor</h3>
<h3 class="author">Someone Else</h3>
</div>
-<div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1999 Norman Walsh</p></div>
<div><p class="pubdate">Apr. 26, 1999</p></div>
<div><div class="abstract">
<p>
-<a name="id2753666"></a><b>Abstract</b>
+<a name="id2766888"></a><b>Abstract</b>
</p>
<p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -35,17 +35,19 @@ This article is just a test. This article is just a test.
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2752845">First level section</a>
+<dt> <a href="#id2766065">First level section</a>
</dt>
-<dd><dl><dt> <a href="#id2752857">Second level section</a>
+<dd><dl><dt> <a href="#id2766076">Second level section</a>
</dt></dl></dd>
+<dt>A <a href="#id2766190">Appendix</a>
+</dt>
</dl>
</div>
<p>
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</p>
<div class="literallayout">This is a <i>literal layout</i><br>
  It'll be a &lt;pre&gt; until the <tt>chunk.pl</tt><br>
@@ -64,7 +66,7 @@ This article is just a test. This article is just a test.
ProgramListing
</pre>
</div>
-<p>This para contains an xref to a figure: <a href="#testfig">Figure 1.</a>.
+<p>This para contains an xref to a figure: <a href="#testfig" title="Figure 1. Test Figure">Figure 1. Test Figure</a>.
</p>
<div class="figure">
<p>
@@ -74,24 +76,24 @@ This article is just a test. This article is just a test.
Test Figure
</pre>
</div>
-<p>This para contains an <a href="#testfig2">link</a> to a
+<p>This para contains an <a href="#testfig2" title="Figure 2. Test Figure2">link</a> to a
figure.
</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2752760"></a>Test item.</p></li>
+<a name="id2765980"></a>Test item.</p></li>
<li><p>
-<a name="id2752771"></a>Test item.</p></li>
+<a name="id2765990"></a>Test item.</p></li>
<li><p>
-<a name="id2752781"></a>Test item.</p></li>
+<a name="id2766001"></a>Test item.</p></li>
</ul></div>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2752799"></a>Test item.</p></li>
+<a name="id2766019"></a>Test item.</p></li>
<li><p>
-<a name="id2752810"></a>Test item.</p></li>
+<a name="id2766029"></a>Test item.</p></li>
<li><p>
-<a name="id2752820"></a>Test item.</p></li>
+<a name="id2766040"></a>Test item.</p></li>
</ol></div>
<p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -100,33 +102,26 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</p>
<div class="section">
-<a name="id2752845"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2752845"></a><span class="title">First level section</span>
-</h2></div></div>
+<a name="id2766065"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766065"></a>First level section</h2></div></div>
<div class="section">
-<a name="id2752857"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2752857"></a><span class="title">Second level section</span>
-</h3></div></div>
+<a name="id2766076"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2766076"></a>Second level section</h3></div></div>
<div class="section">
-<a name="id2752869"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2752869"></a><span class="title">Third level section</span>
-</h4></div></div>
+<a name="id2766088"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2766088"></a>Third level section</h4></div></div>
<div class="section">
-<a name="id2752880"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2752880"></a><span class="title">Fourth level section</span>
-</h5></div></div>
+<a name="id2766100"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2766100"></a>Fourth level section</h5></div></div>
<div class="section">
-<a name="id2752892"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2752892"></a><span class="title">Fifth level section (SI)</span>
-</h6></div></div>
+<a name="id2766111"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766117"></a>Fifth level section (SI)</h6></div></div>
<div class="section">
-<a name="id2752922"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2752922"></a><span class="title">Sixth level section</span>
-</h6></div></div>
+<a name="id2766141"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766141"></a>Sixth level section</h6></div></div>
<div class="section">
-<a name="id2752934"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2752934"></a><span class="title">Seventh level section</span>
-</h6></div></div>
+<a name="id2766153"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766153"></a>Seventh level section</h6></div></div>
<p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -140,9 +135,9 @@ This article is just a test. This article is just a test.
</div>
</div>
</div>
-<div id="id2752970" class="appendix">
-<h2 class="title" style="clear: all">
-<a name="id2752970"></a>Appendix A. Appendix</h2>
+<div class="appendix">
+<h2 class="title" style="clear: both">
+<a name="id2766190"></a>A. Appendix</h2>
<p>This is just a test.</p>
</div>
</div></body>
diff --git a/tests/docbook/result/html/article2.html b/tests/docbook/result/html/article2.html
index 79f14798..933c4c3f 100644
--- a/tests/docbook/result/html/article2.html
+++ b/tests/docbook/result/html/article2.html
@@ -3,18 +3,18 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599542" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599542"></a>Article Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2600532"></a>Article Test Document Title</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
-<div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1999 Norman Walsh</p></div>
<div><p class="pubdate">Apr. 26, 1999</p></div>
<div><div class="abstract">
<p>
-<a name="id2766220"></a><b>Abstract</b>
+<a name="id2779398"></a><b>Abstract</b>
</p>
<p>This article is just a test. This <i>article</i>
is just a test.
@@ -37,7 +37,7 @@ This article is just a test. This article is just a test.
</p>
<div class="table">
<p>
-<a name="id2753681"></a><b>Table 1. This is a test table</b>
+<a name="id2766903"></a><b>Table 1. This is a test table</b>
</p>
<table summary="This is a test table" border="1">
<colgroup>
@@ -94,21 +94,21 @@ This article is just a test. This article is just a test.
</div>
<div class="variablelist"><dl>
<dt>
-<a name="id2752566"></a><span class="term">term</span>
+<a name="id2765795"></a><span class="term">term</span>
</dt>
<dd><p>
-<a name="id2752577"></a>some text</p></dd>
+<a name="id2765806"></a>some text</p></dd>
<dt>
-<a name="id2752594"></a><span class="term">term2a, </span><span class="term">term2b</span>
+<a name="id2765823"></a><span class="term">term2a, </span><span class="term">term2b</span>
</dt>
<dd><p>
-<a name="id2752611"></a>some text</p></dd>
+<a name="id2765840"></a>some text</p></dd>
<dt>
-<a name="id2752628"></a><span class="term">term3</span>
+<a name="id2765857"></a><span class="term">term3</span>
</dt>
<dd>
<p>
-<a name="id2752640"></a>some text</p>
+<a name="id2765868"></a>some text</p>
<p>some text</p>
<p>some text</p>
</dd>
diff --git a/tests/docbook/result/html/article3.html b/tests/docbook/result/html/article3.html
index c9bdd1c5..f7e0a600 100644
--- a/tests/docbook/result/html/article3.html
+++ b/tests/docbook/result/html/article3.html
@@ -3,30 +3,30 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599542" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599542"></a>Article Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2600532"></a>Article Test Document Title</h2></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2766101">First level section</a>
+<dt> <a href="#id2779268">First level section</a>
</dt>
-<dd><dl><dt> <a href="#id2766110">Second level section</a>
+<dd><dl><dt> <a href="#id2779287">Second level section</a>
</dt></dl></dd>
-<dt> <a href="#id2753659">Another Section</a>
+<dt> <a href="#id2766881">Another Section</a>
</dt>
-<dt> <a href="#id2753693">Another Section</a>
+<dt> <a href="#id2766916">Another Section</a>
</dt>
-<dd><dl><dt> <a href="#id2753705">Another Section</a>
+<dd><dl><dt> <a href="#id2766928">Another Section</a>
</dt></dl></dd>
-<dt> <a href="#id2753741">Another Section</a>
+<dt> <a href="#id2766964">Another Section</a>
</dt>
-<dd><dl><dt> <a href="#id2752312">Another Section</a>
+<dd><dl><dt> <a href="#id2765534">Another Section</a>
</dt></dl></dd>
</dl>
</div>
@@ -37,25 +37,20 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</p>
<div class="section">
-<a name="id2766101"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2766101"></a><span class="title">First level section</span>
-</h2></div></div>
+<a name="id2779268"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2779268"></a>First level section</h2></div></div>
<div class="section">
-<a name="id2766110"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2766110"></a><span class="title">Second level section</span>
-</h3></div></div>
+<a name="id2779287"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2779287"></a>Second level section</h3></div></div>
<div class="section">
-<a name="id2766121"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2766121"></a><span class="title">Third level section</span>
-</h4></div></div>
+<a name="id2779298"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2779387"></a>Third level section</h4></div></div>
<div class="section">
-<a name="id2766225"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2766225"></a><span class="title">Fourth level section</span>
-</h5></div></div>
+<a name="id2779403"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2779403"></a>Fourth level section</h5></div></div>
<div class="section">
-<a name="id2766236"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2766236"></a><span class="title">Fifth level section</span>
-</h6></div></div>
+<a name="id2779414"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766850"></a>Fifth level section</h6></div></div>
<p>This is just a test.</p>
</div>
</div>
@@ -63,48 +58,39 @@ This article is just a test. This article is just a test.
</div>
</div>
<div class="section">
-<a name="id2753659"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753659"></a><span class="title">Another Section</span>
-</h2></div></div>
+<a name="id2766881"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766881"></a>Another Section</h2></div></div>
<div class="simplesect">
-<a name="id2753670"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2753670"></a><span class="title">SimpleSect @ level 2</span>
-</h3></div></div>
+<a name="id2766893"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2766893"></a>SimpleSect @ level 2</h3></div></div>
<p>This is just a test.</p>
</div>
</div>
<div class="section">
-<a name="id2753693"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753693"></a><span class="title">Another Section</span>
-</h2></div></div>
+<a name="id2766916"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766916"></a>Another Section</h2></div></div>
<div class="section">
-<a name="id2753705"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2753705"></a><span class="title">Another Section</span>
-</h3></div></div>
+<a name="id2766928"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2766928"></a>Another Section</h3></div></div>
<div class="simplesect">
-<a name="id2753716"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2753716"></a><span class="title">SimpleSect @ level 3</span>
-</h4></div></div>
+<a name="id2766939"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2766939"></a>SimpleSect @ level 3</h4></div></div>
<p>This is just a test.</p>
</div>
</div>
</div>
<div class="section">
-<a name="id2753741"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753741"></a><span class="title">Another Section</span>
-</h2></div></div>
+<a name="id2766964"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766964"></a>Another Section</h2></div></div>
<div class="section">
-<a name="id2752312"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2752312"></a><span class="title">Another Section</span>
-</h3></div></div>
+<a name="id2765534"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2765534"></a>Another Section</h3></div></div>
<div class="section">
-<a name="id2752324"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2752324"></a><span class="title">Another Section</span>
-</h4></div></div>
+<a name="id2765545"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2765545"></a>Another Section</h4></div></div>
<div class="simplesect">
-<a name="id2752335"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2752335"></a><span class="title">SimpleSect @ level 4</span>
-</h5></div></div>
+<a name="id2765557"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2765557"></a>SimpleSect @ level 4</h5></div></div>
<p>This is just a test.</p>
</div>
</div>
diff --git a/tests/docbook/result/html/bib.html b/tests/docbook/result/html/bib.html
index e74624e1..5326131e 100644
--- a/tests/docbook/result/html/bib.html
+++ b/tests/docbook/result/html/bib.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Test Book</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -15,20 +15,21 @@
<p><b>Table of Contents</b></p>
<dl><dt><a href="#bib1">A Test Bibliography</a></dt></dl>
</div>
-<div class="bibliography">
-<h2 class="title"><a name="bib1">A Test Bibliography</a></h2>
+<div id="bib1" class="bibliography">
+<div class="titlepage"><div><h2 class="title">
+<a name="bib1"></a>A Test Bibliography</h2></div></div>
<p>The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</p>
<div class="bibliodiv">
-<h3 class="title"><a name="id2757398">Books</a></h3>
-<div id="id2757412" class="biblioentry">
-<a name="id2757412"></a><p>
-<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
+<h3 class="title"><a name="id2770576">Books</a></h3>
+<div id="id2770590" class="biblioentry">
+<a name="id2770590"></a><p>
+<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
</p>
</div>
</div>
<div class="bibliodiv">
-<h3 class="title"><a name="id2799222">Periodicals</a></h3>
+<h3 class="title"><a name="id2812432">Periodicals</a></h3>
<div id="walsh97" class="biblioentry">
<a name="walsh97"></a><p>
<span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span>
@@ -44,8 +45,8 @@ a lot of tweaking. It probably doesn't conform to any specific style.</p>
<span class="corpname">The World Wide Web Consortium</span>.
<span class="pubdate">Winter, 1996</span></span>.</p>
</div>
-<div id="id2755564" class="biblioentry">
-<a name="id2755564"></a><p>
+<div id="id2768829" class="biblioentry">
+<a name="id2768829"></a><p>
<span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
diff --git a/tests/docbook/result/html/book.html b/tests/docbook/result/html/book.html
index 74ecbf34..d49b9085 100644
--- a/tests/docbook/result/html/book.html
+++ b/tests/docbook/result/html/book.html
@@ -3,19 +3,19 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799186">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2812391">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799186"></a>Book Test Document Title</h1></div>
+<a name="id2812391"></a>Bookinfo Test Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div>
<h3 class="author">Norman Walsh</h3>
<h3 class="author">John Doe</h3>
</div>
-<div><span class="releaseinfo">Some releaseinfo<br></span></div>
-<div><p class="copyright">Copyright © 2000 by Norman Walsh</p></div>
+<div><p class="releaseinfo">Some releaseinfo</p></div>
+<div><p class="copyright">Copyright © 2000 Norman Walsh</p></div>
<div><div class="legalnotice"><p>Some legal notice. Some legal notice. Some legal notice.
Some legal notice. Some legal notice. Some legal notice.
Some legal notice. Some legal notice. Some legal notice.
@@ -24,7 +24,7 @@ Some legal notice. Some legal notice. Some legal notice.
<div><p class="pubdate">16 December 2000</p></div>
<div><div class="abstract">
<p>
-<a name="id2862739"></a><b>Abstract</b>
+<a name="id2875925"></a><b>Abstract</b>
</p>
<p>Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
@@ -39,9 +39,9 @@ Some abstract. Some abstract. Some abstract. Some abstract.
</div></div>
<hr>
</div>
-<div id="id2799307" class="dedication">
+<div id="id2812515" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799307"></a>First Dedication</h2></div></div>
+<a name="id2812515"></a>First Dedication</h2></div></div>
<p>Just a test. &#x201C;What about&#x2014;this?&#x201D;</p>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah blah blah blah blah. Blah blah blah blah.
@@ -224,69 +224,79 @@ Blah blah blah blah blah blah blah blah. Blah blah blah blah.
Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</p>
</div>
-<div id="id2757474" class="dedication">
+<div id="id2812535" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2757474"></a>Dedication</h2></div></div>
+<a name="id2812535"></a>Dedication</h2></div></div>
<p>Just a test dedication.</p>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2755512">Foreword</a>
+<dt> <a href="#id2812486">Foreword</a>
</dt>
-<dt> <a href="#id2755542">Preface</a>
+<dt> <a href="#id2812496"></a>
</dt>
-<dt>I. <a href="#id2755558">Part One Title</a>
+<dt>I <a href="#id2768816">Part One Title</a>
</dt>
-<dt>2. <a href="#id2753974">First Chapter</a>
+<dd><dl>
+<dt>1 <a href="#chapter">Section Tests</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2767056">First Sect1</a>
</dt>
-<dt>3. <a href="#id2754052">Second Chapter</a>
+<dt> <a href="#id2767114">Second Sect1</a>
</dt>
-<dt>4. <a href="#id2754272">Third Chapter</a>
+<dt> <a href="#id2767136">Third Sect1</a>
</dt>
-<dt>A. <a href="#id2754293">First Appendix</a>
+</dl></dd>
+</dl></dd>
+<dt>2 <a href="#id2767198">First Chapter</a>
</dt>
-<dt>B. <a href="#id2754353">Second Appendix</a>
+<dt>3 <a href="#id2767276">Second Chapter</a>
+</dt>
+<dt>4 <a href="#id2767495">Third Chapter</a>
+</dt>
+<dt>A <a href="#id2767517">First Appendix</a>
+</dt>
+<dt>B <a href="#id2767576">Second Appendix</a>
</dt>
</dl>
</div>
-<div id="id2755512" class="preface">
+<div id="id2812486" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755512"></a>Foreword</h2></div></div>
+<a name="id2812486"></a>Foreword</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="id2755542" class="preface">
-<div class="titlepage"><div><h2 class="title">
-<a name="id2755542"></a>Preface</h2></div></div>
+<div id="id2812496" class="preface">
+<div class="titlepage"></div>
<p>This is a test preface.</p>
</div>
-<div class="part" id="id2755558">
+<div class="part" id="id2768816">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2755558"></a>Part One Title</h1></div>
+<a name="id2768816"></a>Part One Title</h1></div>
<div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div>
</div>
<div class="partintro">
<div><div><h1 class="title">
-<a name="id2755603"></a>PartIntro Title</h1></div></div>
-<p>Partintro content<sup>[<a name="id2755623" href="#ftn.id2755623">1</a>]</sup>.</p>
+<a name="id2768862"></a>PartIntro Title</h1></div></div>
+<p>Partintro content<sup>[<a name="id2768883" href="#ftn.id2768883">1</a>]</sup>.</p>
<div class="sect1">
-<a name="id2755640"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755640"></a><span class="title">PartIntro Section</span>
-</h2></div></div>
+<a name="id2768901"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2768901"></a>PartIntro Section</h2></div></div>
<p>PartIntros can actually have section content as well.</p>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#chapter">Section Tests</a>
+<dt>1 <a href="#chapter">Section Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2753833">First Sect1</a>
+<dt> <a href="#id2767056">First Sect1</a>
</dt>
-<dt> <a href="#id2753891">Second Sect1</a>
+<dt> <a href="#id2767114">Second Sect1</a>
</dt>
-<dt> <a href="#id2753912">Third Sect1</a>
+<dt> <a href="#id2767136">Third Sect1</a>
</dt>
</dl></dd>
</dl>
@@ -294,27 +304,26 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2755623" href="#id2755623">1</a>] </sup>This is a footnote in a partintro.</p></div>
+<sup>[<a name="ftn.id2768883" href="#id2768883">1</a>] </sup>This is a footnote in a partintro.</p></div>
</div>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. Section <a name="stestfoo"></a>Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2753833">First Sect1</a>
+<dt> <a href="#id2767056">First Sect1</a>
</dt>
-<dt> <a href="#id2753891">Second Sect1</a>
+<dt> <a href="#id2767114">Second Sect1</a>
</dt>
-<dt> <a href="#id2753912">Third Sect1</a>
+<dt> <a href="#id2767136">Third Sect1</a>
</dt>
</dl>
</div>
<div class="sect1">
-<a name="id2753833"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753833"></a><span class="title">First Sect1</span>
-</h2></div></div>
+<a name="id2767056"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767056"></a>First Sect1</h2></div></div>
<p>Paragraph.</p>
<div class="figure">
<p>
@@ -326,15 +335,13 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</div>
</div>
<div class="sect1">
-<a name="id2753891"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753891"></a><span class="title">Second Sect1</span>
-</h2></div></div>
+<a name="id2767114"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767114"></a>Second Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2753912"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753912"></a><span class="title">Third Sect1</span>
-</h2></div></div>
+<a name="id2767136"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767136"></a>Third Sect1</h2></div></div>
<p>Paragraph.</p>
<div class="figure">
<p>
@@ -347,11 +354,11 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</div>
</div>
</div>
-<div id="id2753974" class="chapter">
+<div class="chapter">
<div class="titlepage">
<div><h2 class="title">
-<a name="id2753974"></a>Chapter 2. First Chapter</h2></div>
-<div><h2 class="subtitle">Chapter Subtitle</h2></div>
+<a name="id2767198"></a>Chapter 2. First Chapter</h2></div>
+<div><h3 class="subtitle"><i>Chapter Subtitle</i></h3></div>
</div>
<p>This is a test paragraph.</p>
<div class="figure">
@@ -363,34 +370,34 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</pre>
</div>
</div>
-<div id="id2754052" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2754052"></a>Chapter 3. Second Chapter</h2></div></div>
+<a name="id2767276"></a>Chapter 3. Second Chapter</h2></div></div>
<p>This is a test paragraph.
-<a class="indexterm" name="id2754070"></a>
-<a class="indexterm" name="id2754086"></a>
+<a class="indexterm" name="id2767294"></a>
+<a class="indexterm" name="id2767309"></a>
-<a class="indexterm" name="id2754102"></a>
-<a class="indexterm" name="id2754125"></a>
+<a class="indexterm" name="id2767325"></a>
+<a class="indexterm" name="id2767348"></a>
-<a class="indexterm" name="id2754141"></a>
+<a class="indexterm" name="id2767364"></a>
-<a class="indexterm" name="id2754172"></a>
-<a class="indexterm" name="id2754188"></a>
+<a class="indexterm" name="id2767396"></a>
+<a class="indexterm" name="id2767411"></a>
-<a class="indexterm" name="id2754208"></a>
-<a class="indexterm" name="id2754232"></a>
-<a class="indexterm" name="id2754256"></a>
+<a class="indexterm" name="id2767432"></a>
+<a class="indexterm" name="id2767455"></a>
+<a class="indexterm" name="id2767479"></a>
</p>
</div>
-<div id="id2754272" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2754272"></a>Chapter 4. Third Chapter</h2></div></div>
+<a name="id2767495"></a>Chapter 4. Third Chapter</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="id2754293" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2754293"></a>Appendix A. First Appendix</h2></div></div>
+<a name="id2767517"></a>Appendix A. First Appendix</h2></div></div>
<p>This is just a test.</p>
<div class="figure">
<p>
@@ -401,22 +408,22 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
</pre>
</div>
</div>
-<div id="id2754353" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2754353"></a>Appendix B. Second Appendix</h2></div></div>
+<a name="id2767576"></a>Appendix B. Second Appendix</h2></div></div>
<p>This is just a test.
-<a class="indexterm" name="id2754371"></a>
-<a class="indexterm" name="id2754386"></a>
+<a class="indexterm" name="id2767594"></a>
+<a class="indexterm" name="id2767610"></a>
-<a class="indexterm" name="id2754402"></a>
-<a class="indexterm" name="id2754426"></a>
+<a class="indexterm" name="id2767625"></a>
+<a class="indexterm" name="id2767649"></a>
-<a class="indexterm" name="id2755664"></a>
-<a class="indexterm" name="id2752535"></a>
+<a class="indexterm" name="id2767035"></a>
+<a class="indexterm" name="id2765757"></a>
-<a class="indexterm" name="id2752553"></a>
-<a class="indexterm" name="id2752576"></a>
-<a class="indexterm" name="id2752600"></a>
+<a class="indexterm" name="id2765774"></a>
+<a class="indexterm" name="id2765798"></a>
+<a class="indexterm" name="id2765821"></a>
</p>
</div>
</div></body>
diff --git a/tests/docbook/result/html/book2.html b/tests/docbook/result/html/book2.html
index 82cdb772..cc25e455 100644
--- a/tests/docbook/result/html/book2.html
+++ b/tests/docbook/result/html/book2.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -11,7 +11,7 @@
<a name="book"></a>Book Title</h1></div>
<div><h3 class="corpauthor">Some Corporation</h3></div>
<div><h3 class="author">Norman Walsh</h3></div>
-<div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1998 Norman Walsh</p></div>
<div><div class="legalnotice">
<p class="legalnotice-title"><b>Legal Notice</b></p>
<p>This is a test document. You can do what you will with it.</p>
@@ -27,9 +27,9 @@
</p></div></div>
<hr>
</div>
-<div id="id2751398" class="dedication">
+<div id="id2600532" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2751398"></a>Dedication</h2></div></div>
+<a name="id2600532"></a>Dedication</h2></div></div>
<p>This test book is dedicated to all the testers. This is the first para
of the dedication.</p>
<p>This is the second para of the dedication.</p>
@@ -38,99 +38,154 @@ of the dedication.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2862712">Preface Title</a>
+<dt> <a href="#id2875909">Preface Title</a>
</dt>
-<dt>I. <a href="#id2799268">Part One Title</a>
+<dt>I <a href="#id2812477">Part One Title</a>
</dt>
-<dt>II. <a href="#part">Part Two Title</a>
+<dd><dl>
+<dt>1 <a href="#chapter">XRef Tests</a>
+</dt>
+<dt>2 <a href="#stchap">Section Tests</a>
+</dt>
+<dd><dl>
+<dt> <a href="#secttest1">a sect1 title</a>
+</dt>
+<dd><dl><dt> <a href="#id2766088">a sect2 title</a>
+</dt></dl></dd>
+<dt> <a href="#secttest2">another sect1 title</a>
+</dt>
+<dd><dl><dt> <a href="#id2766613">another sect2 title</a>
+</dt></dl></dd>
+<dt> <a href="#secttest3">another sect1 title</a>
+</dt>
+<dt> <a href="#secttest4">another sect1 title</a>
+</dt>
+</dl></dd>
+<dt>3 <a href="#id2766842">Inline Tests</a>
+</dt>
+<dt>4 <a href="#id2877295">Block Tests</a>
</dt>
-<dt>III. <a href="#id2877118">A Reference Part</a>
+<dt>5 <a href="#id2878871">List Tests</a>
</dt>
-<dt>A. <a href="#appendix">A Very Short Appendix</a>
+<dt>6 <a href="#id2882449">Table Tests</a>
</dt>
-<dt>B. <a href="#id2877460">A Very Long Appendix</a>
+<dt>7 <a href="#id2888110">Index Term Tests</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2888181">Index Term Sect 1</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2888483">Index Term Sect 2</a>
+</dt>
+<dt> <a href="#id2888627">Index Term Sect 3</a>
+</dt>
+</dl></dd>
+</dl></dd>
+</dl></dd>
+<dt>II <a href="#part">Part Two Title</a>
+</dt>
+<dd><dl>
+<dt>8 <a href="#id2888679">CmdSynopsis Tests</a>
+</dt>
+<dt>9 <a href="#id2889436">FuncSynopsis Tests</a>
+</dt>
+<dt>10 <a href="#id2889732">Callout Tests</a>
+</dt>
+</dl></dd>
+<dt>III <a href="#id2890295">A Reference Part</a>
</dt>
<dd><dl>
-<dt> <a href="#id2878110">a sect1 title</a>
+<dt>I <a href="#reference">Reference</a>
</dt>
-<dd><dl><dt> <a href="#id2878141">a sect2 title</a>
+<dd><dl>
+<dt><a href="#id2890332">RefEntryTitle</a></dt>
+<dt><a href="#id2890517"><tt>Chop</tt></a></dt>
+</dl></dd>
+</dl></dd>
+<dt>A <a href="#appendix">A Very Short Appendix</a>
+</dt>
+<dt>B <a href="#id2890637">A Very Long Appendix</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2891288">a sect1 title</a>
+</dt>
+<dd><dl><dt> <a href="#id2891318">a sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2878280">another sect1 title</a>
+<dt> <a href="#id2891458">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2878335">another sect2 title</a>
+<dd><dl><dt> <a href="#id2891512">another sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2878570">another sect1 title</a>
+<dt> <a href="#id2891747">another sect1 title</a>
</dt>
-<dt> <a href="#id2878602">another sect1 title</a>
+<dt> <a href="#id2891780">another sect1 title</a>
</dt>
</dl></dd>
<dt><a href="#bib1">A Test Bibliography</a></dt>
<dt><a href="#gloss">Example Glossary</a></dt>
<dt><a href="#index">Index</a></dt>
-<dt><a href="#id2880654">An Index with a Title</a></dt>
+<dt><a href="#id2893831">An Index with a Title</a></dt>
</dl>
</div>
-<div id="id2862712" class="preface">
+<div id="id2875909" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2862712"></a>Preface Title</h2></div></div>
+<a name="id2875909"></a>Preface Title</h2></div></div>
<p>Preface content.</p>
<p>This is the second para of the preface.</p>
<p>This is the third para of the preface.</p>
</div>
-<div class="part" id="id2799268">
+<div class="part" id="id2812477">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799268"></a>Part One Title</h1></div>
+<a name="id2812477"></a>Part One Title</h1></div>
<div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div>
</div>
<div class="partintro">
<div><div><h1 class="title">
-<a name="id2799314"></a>PartIntro Title</h1></div></div>
-<p>Partintro content<sup>[<a name="id2799197" href="#ftn.id2799197">1</a>]</sup>.</p>
+<a name="id2812521"></a>PartIntro Title</h1></div></div>
+<p>Partintro content<sup>[<a name="id2812404" href="#ftn.id2812404">1</a>]</sup>.</p>
<div class="sect1">
-<a name="id2799214"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2799214"></a><span class="title">PartIntro Section</span>
-</h2></div></div>
+<a name="id2812420"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2812420"></a>PartIntro Section</h2></div></div>
<p>PartIntros can actually have section content as well.</p>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#chapter">XRef Tests</a>
+<dt>1 <a href="#chapter">XRef Tests</a>
</dt>
-<dt>2. <a href="#stchap">Section Tests</a>
+<dt>2 <a href="#stchap">Section Tests</a>
</dt>
<dd><dl>
<dt> <a href="#secttest1">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2752870">a sect2 title</a>
+<dd><dl><dt> <a href="#id2766088">a sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest2">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2753388">another sect2 title</a>
+<dd><dl><dt> <a href="#id2766613">another sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest3">another sect1 title</a>
</dt>
<dt> <a href="#secttest4">another sect1 title</a>
</dt>
</dl></dd>
-<dt>3. <a href="#id2753614">Inline Tests</a>
+<dt>3 <a href="#id2766842">Inline Tests</a>
</dt>
-<dt>4. <a href="#id2864117">Block Tests</a>
+<dt>4 <a href="#id2877295">Block Tests</a>
</dt>
-<dt>5. <a href="#id2865693">List Tests</a>
+<dt>5 <a href="#id2878871">List Tests</a>
</dt>
-<dt>6. <a href="#id2869271">Table Tests</a>
+<dt>6 <a href="#id2882449">Table Tests</a>
</dt>
-<dt>7. <a href="#id2874933">Index Term Tests</a>
+<dt>7 <a href="#id2888110">Index Term Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2875004">Index Term Sect 1</a>
+<dt> <a href="#id2888181">Index Term Sect 1</a>
</dt>
<dd><dl>
-<dt> <a href="#id2875306">Index Term Sect 2</a>
+<dt> <a href="#id2888483">Index Term Sect 2</a>
</dt>
-<dt> <a href="#id2875449">Index Term Sect 3</a>
+<dt> <a href="#id2888627">Index Term Sect 3</a>
</dt>
</dl></dd>
</dl></dd>
@@ -139,54 +194,54 @@ of the dedication.</p>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2799197" href="#id2799197">1</a>] </sup>This is a footnote in a partintro.</p></div>
+<sup>[<a name="ftn.id2812404" href="#id2812404">1</a>] </sup>This is a footnote in a partintro.</p></div>
</div>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. XRef Tests</h2></div></div>
-<h3>Xrefs</h3>
+<h4>Xrefs</h4>
<table class="simplelist" border="0" summary="Simple list">
-<tr><td><a href="#book"><i>Book Title</i></a></td></tr>
-<tr><td><a href="#part">Part II.</a></td></tr>
-<tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr>
-<tr><td><a href="#appendix">Appendix A.</a></td></tr>
-<tr><td><a href="#table">Table 4.0.</a></td></tr>
-<tr><td><a href="#figure">Figure 4.0.</a></td></tr>
-<tr><td><a href="#example">Example 4.0.</a></td></tr>
-<tr><td><a href="#equation">Equation 4.0.</a></td></tr>
-<tr><td><a href="#reference">Reference I.</a></td></tr>
-<tr><td><a href="#bib1">&#x201C;A Test Bibliography&#x201D;</a></td></tr>
-<tr><td><a href="#gloss">&#x201C;Example Glossary&#x201D;</a></td></tr>
-<tr><td><a href="#index">&#x201C;Index&#x201D;</a></td></tr>
+<tr><td><a href="#book" title="Book Title">Book Title</a></td></tr>
+<tr><td><a href="#part" title="Part II. Part Two Title">Part II. Part Two Title</a></td></tr>
+<tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr>
+<tr><td><a href="#appendix" title="Appendix A. A Very Short Appendix">Appendix A. A Very Short Appendix</a></td></tr>
+<tr><td><a href="#table" title="Table 4.0. A Table">Table 4.0. A Table</a></td></tr>
+<tr><td><a href="#figure" title="Figure 4.0. A Figure">Figure 4.0. A Figure</a></td></tr>
+<tr><td><a href="#example" title="Example 4.0. An Example">Example 4.0. An Example</a></td></tr>
+<tr><td><a href="#equation" title="Equation 4.0. An Equation"></a></td></tr>
+<tr><td><a href="#reference" title="Reference">Reference</a></td></tr>
+<tr><td><a href="#bib1" title="A Test Bibliography">A Test Bibliography</a></td></tr>
+<tr><td><a href="#gloss" title="Example Glossary">Example Glossary</a></td></tr>
+<tr><td><a href="#index" title="Index">Index</a></td></tr>
</table>
<p>This is the first reference to <i>XML</i>.
-This is the second reference to XML.
-These are references without linkend
-attributes: <i>XML</i>, XML.</p>
-<h3>Links</h3>
+This is the second reference to <a href="#xml"><i>XML</i></a>.
+These are references without <tt>linkend</tt>
+attributes: <i>XML</i>, <i>XML</i>.</p>
+<h4>Links</h4>
<p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
is available.</p>
-<p>There is <a href="#part">a second part</a> in this book.</p>
-<p>This is the <a href="#chapter"></a>
+<p>There is <a href="#part" title="Part II. Part Two Title">a second part</a> in this book.</p>
+<p>This is the <a href="#chapter" title="Chapter 1. XRef Tests"></a>
chapter.</p>
</div>
-<div id="stchap" class="chapter">
+<div class="chapter">
<div class="titlepage">
<div><h2 class="title">
<a name="stchap"></a>Chapter 2. Section Tests</h2></div>
-<div><h2 class="subtitle">Section Tests Subtitle</h2></div>
+<div><h3 class="subtitle"><i>Section Tests Subtitle</i></h3></div>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
<dt> <a href="#secttest1">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2752870">a sect2 title</a>
+<dd><dl><dt> <a href="#id2766088">a sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest2">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2753388">another sect2 title</a>
+<dd><dl><dt> <a href="#id2766613">another sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest3">another sect1 title</a>
</dt>
@@ -200,18 +255,18 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2754049"></a>
-<a class="indexterm" name="id2754065"></a>
+<a class="indexterm" name="id2767270"></a>
+<a class="indexterm" name="id2767286"></a>
-<a class="indexterm" name="id2754081"></a>
-<a class="indexterm" name="id2754104"></a>
+<a class="indexterm" name="id2767301"></a>
+<a class="indexterm" name="id2767325"></a>
-<a class="indexterm" name="id2754120"></a>
-<a class="indexterm" name="id2754151"></a>
+<a class="indexterm" name="id2767340"></a>
+<a class="indexterm" name="id2767372"></a>
-<a class="indexterm" name="id2754167"></a>
-<a class="indexterm" name="id2754191"></a>
-<a class="indexterm" name="id2754214"></a>
+<a class="indexterm" name="id2767388"></a>
+<a class="indexterm" name="id2767411"></a>
+<a class="indexterm" name="id2767435"></a>
</p>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -232,29 +287,28 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect1">
-<a name="secttest1"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest1"></a><span class="title">a sect1 title</span>
-</h2></div></div>
+<a name="secttest1"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest1"></a>a sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2754322"></a>
-<a class="indexterm" name="id2754353"></a>
-<a class="indexterm" name="id2754377"></a>
+<a class="indexterm" name="id2767542"></a>
+<a class="indexterm" name="id2767574"></a>
+<a class="indexterm" name="id2767597"></a>
-<a class="indexterm" name="id2754392"></a>
-<a class="indexterm" name="id2754416"></a>
-<a class="indexterm" name="id2753833"></a>
+<a class="indexterm" name="id2767613"></a>
+<a class="indexterm" name="id2767636"></a>
+<a class="indexterm" name="id2767501"></a>
-<a class="indexterm" name="id2753894"></a>
-<a class="indexterm" name="id2752696"></a>
-<a class="indexterm" name="id2752720"></a>
-<a class="indexterm" name="id2752751"></a>
-<a class="indexterm" name="id2752782"></a>
-<a class="indexterm" name="id2752806"></a>
+<a class="indexterm" name="id2767112"></a>
+<a class="indexterm" name="id2765914"></a>
+<a class="indexterm" name="id2765938"></a>
+<a class="indexterm" name="id2765969"></a>
+<a class="indexterm" name="id2766001"></a>
+<a class="indexterm" name="id2766024"></a>
</p>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -275,9 +329,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2752870"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2752870"></a><span class="title">a sect2 title</span>
-</h3></div></div>
+<a name="id2766088"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2766088"></a>a sect2 title</h3></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -285,30 +338,28 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2752901"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2752901"></a><span class="title">a sect3 title</span>
-</h4></div></div>
+<a name="id2766119"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2766119"></a>a sect3 title</h4></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752930"></a>
-<a class="indexterm" name="id2752961"></a>
-<a class="indexterm" name="id2752992"></a>
+<a class="indexterm" name="id2766148"></a>
+<a class="indexterm" name="id2766179"></a>
+<a class="indexterm" name="id2766211"></a>
-<a class="indexterm" name="id2753008"></a>
-<a class="indexterm" name="id2753024"></a>
-<a class="indexterm" name="id2753047"></a>
-<a class="indexterm" name="id2753079"></a>
-<a class="indexterm" name="id2753110"></a>
-<a class="indexterm" name="id2753142"></a>
+<a class="indexterm" name="id2766226"></a>
+<a class="indexterm" name="id2766242"></a>
+<a class="indexterm" name="id2766266"></a>
+<a class="indexterm" name="id2766297"></a>
+<a class="indexterm" name="id2766328"></a>
+<a class="indexterm" name="id2766360"></a>
</p>
<div class="sect4">
-<a name="id2753156"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2753156"></a><span class="title">a sect4 title</span>
-</h5></div></div>
+<a name="id2766374"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2766374"></a>a sect4 title</h5></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -316,9 +367,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2753187"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2753187"></a><span class="title">a sect5 title</span>
-</h6></div></div>
+<a name="id2766405"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766405"></a>a sect5 title</h6></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -332,9 +382,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
<div class="sect1">
<a name="secttest2"></a><div class="titlepage">
-<div><h2 class="title" style="clear: all">
-<a name="secttest2"></a><span class="title">another sect1 title</span>
-</h2></div>
+<div><h2 class="title" style="clear: both">
+<a name="id2766465"></a>another sect1 title</h2></div>
<div><h2 class="subtitle">a sect1 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -343,16 +392,15 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753225"></a>
-<a class="indexterm" name="id2753310"></a>
-<a class="indexterm" name="id2753341"></a>
-<a class="indexterm" name="id2753373"></a>
+<a class="indexterm" name="id2766520"></a>
+<a class="indexterm" name="id2766536"></a>
+<a class="indexterm" name="id2766567"></a>
+<a class="indexterm" name="id2766599"></a>
</p>
<div class="sect2">
-<a name="id2753388"></a><div class="titlepage">
+<a name="id2766613"></a><div class="titlepage">
<div><h3 class="title">
-<a name="id2753388"></a><span class="title">another sect2 title</span>
-</h3></div>
+<a name="id2766620"></a>another sect2 title</h3></div>
<div><h2 class="subtitle">a sect2 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -362,10 +410,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2753442"></a><div class="titlepage">
+<a name="id2766668"></a><div class="titlepage">
<div><h4 class="title">
-<a name="id2753442"></a><span class="title">another sect3 title</span>
-</h4></div>
+<a name="id2766674"></a>another sect3 title</h4></div>
<div><h2 class="subtitle">a sect3 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -375,10 +422,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2753496"></a><div class="titlepage">
+<a name="id2766722"></a><div class="titlepage">
<div><h5 class="title">
-<a name="id2753496"></a><span class="title">another sect4 title</span>
-</h5></div>
+<a name="id2766728"></a>another sect4 title</h5></div>
<div><h2 class="subtitle">a sect4 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -388,10 +434,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2753551"></a><div class="titlepage">
+<a name="id2766777"></a><div class="titlepage">
<div><h6 class="title">
-<a name="id2753551"></a><span class="title">another sect5 title</span>
-</h6></div>
+<a name="id2766783"></a>another sect5 title</h6></div>
<div><h2 class="subtitle">a sect5 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -406,9 +451,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="secttest3"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest3"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="secttest3"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest3"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -417,9 +461,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
<div class="sect1">
-<a name="secttest4"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest4"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="secttest4"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest4"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -428,21 +471,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
</div>
-<div id="id2753614" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2753614"></a>Chapter 3. Inline Tests</h2></div></div>
+<a name="id2766842"></a>Chapter 3. Inline Tests</h2></div></div>
<div class="simplesect">
-<a name="id2863048"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2863048"></a><span class="title">Testing `Quotes' in a title</span>
-</h2></div></div>
+<a name="id2766447"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766447"></a>Testing &#x2018;Quotes&#x2019; in a title</h2></div></div>
<p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
-Sort of<sup>[<a name="id2863100" href="#ftn.id2863100">3</a>]</sup>.
+Sort of<sup>[<a name="id2876278" href="#ftn.id2876278">3</a>]</sup>.
Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>Abbrev</td>
<td>GUIIcon</td>
-<td>SGMLTag (Attribute)</td>
+<td>
+<tt>SGMLTag</tt> (Attribute)</td>
</tr>
<tr>
<td>Acronym</td>
@@ -542,7 +585,7 @@ Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
<tr>
<td><tt>Filename</tt></td>
<td><i><tt>Parameter</tt></i></td>
-<td>Trademark</td>
+<td>Trademark&#x2122;</td>
</tr>
<tr>
<td><i>Firstterm</i></td>
@@ -577,8 +620,8 @@ Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
</table>
<p>And here are a couple of index terms, as another test (of
index terms, not inlines).
-<a class="indexterm" name="id2864068"></a>
-<a class="indexterm" name="id2864091"></a>
+<a class="indexterm" name="id2877246"></a>
+<a class="indexterm" name="id2877269"></a>
</p>
</div>
<div class="footnotes">
@@ -586,38 +629,37 @@ index terms, not inlines).
<div class="footnote"><p>
<sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div>
<div class="footnote"><p>
-<sup>[<a name="ftn.id2863100" href="#id2863100">3</a>] </sup>Well, the marks are, anyway!</p></div>
+<sup>[<a name="ftn.id2876278" href="#id2876278">3</a>] </sup>Well, the marks are, anyway!</p></div>
</div>
</div>
-<div id="id2864117" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2864117"></a>Chapter 4. Block Tests</h2></div></div>
+<a name="id2877295"></a>Chapter 4. Block Tests</h2></div></div>
<div class="simplesect">
-<a name="id2864131"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2864131"></a><span class="title">Formal Objects</span>
-</h2></div></div>
-<h3>Example</h3>
+<a name="id2877309"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2877309"></a>Formal Objects</h2></div></div>
+<h5>Example</h5>
<div class="example">
<p>
<a name="example"></a><b>Example 4.0. An Example</b>
</p>
<p>This is an example of a trivial example.</p>
</div>
-<h3>Figure</h3>
+<h5>Figure</h5>
<div class="figure">
<p>
<a name="figure"></a><b>Figure 4.0. A Figure</b>
</p>
<pre class="screen">This is an example of a trivial figure.</pre>
</div>
-<h3>Equation</h3>
+<h5>Equation</h5>
<div class="equation">
<p>
<a name="equation"></a><b>Equation 4.0. An Equation</b>
</p>
<p><img src="emc2.gif"></p>
</div>
-<h3>Table</h3>
+<h5>Table</h5>
<div class="table">
<p>
<a name="table"></a><b>Table 4.0. A Table</b>
@@ -645,24 +687,18 @@ index terms, not inlines).
</div>
</div>
<div class="simplesect">
-<a name="id2864441"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2864441"></a><span class="title">Informal Objects</span>
-</h2></div></div>
-<h3>InformalExample</h3>
+<a name="id2877619"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2877619"></a>Informal Objects</h2></div></div>
+<h5>InformalExample</h5>
<div class="informalexample" id="iexample">
-<p>
<a name="iexample"></a><p>This is an example of a trivial, informal example.</p>
-<p>
</div>
-<h3>InformalEquation</h3>
+<h5>InformalEquation</h5>
<div class="informalequation" id="iequation">
-<p>
<a name="iequation"></a><p><img src="emc2.gif"></p>
-<p>
</div>
-<h3>InformalTable</h3>
+<h5>InformalTable</h5>
<div class="informaltable" id="itable">
-<p>
<a name="itable"></a><table border="1">
<colgroup>
<col>
@@ -683,64 +719,70 @@ index terms, not inlines).
</tr>
</tbody>
</table>
-<p>
</div>
</div>
<div class="simplesect">
-<a name="id2864664"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2864664"></a><span class="title">Admonitions</span>
-</h2></div></div>
-<h3>Note</h3>
+<a name="id2877842"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2877842"></a>Admonitions</h2></div></div>
+<h5>Note</h5>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864693">Note</a></h3>
+<h3 class="title">
+<a name="id2877871"></a>Note</h3>
<p>Consider yourself noted.</p>
<p>Second para.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864716">Note</a></h3>
+<h3 class="title">
+<a name="id2877894"></a>Note</h3>
<p>Consider yourself noted, simply.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864732">NoteTitle</a></h3>
+<h3 class="title">
+<a name="id2877910"></a>NoteTitle</h3>
<p>Consider yourself noted.</p>
<p>Second para, with a title.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864764">Att</a></h3>
+<h3 class="title">
+<a name="id2877942"></a>Att</h3>
<p>Consider yourself noted, simply.</p>
<p>With a title</p>
</div>
-<h3>Important</h3>
+<h5>Important</h5>
<div class="important" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864811">Important</a></h3>
+<h3 class="title">
+<a name="id2877989"></a>Important</h3>
<p>Consider yourself important.</p>
</div>
-<h3>Tip</h3>
+<h5>Tip</h5>
<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864829">Tip</a></h3>
+<h3 class="title">
+<a name="id2878007"></a>Tip</h3>
<p>Consider yourself tipped.</p>
</div>
-<h3>Warning</h3>
+<h5>Warning</h5>
<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864869">Warning</a></h3>
+<h3 class="title">
+<a name="id2878047"></a>Warning</h3>
<p>Consider yourself warned.</p>
</div>
-<h3>Caution</h3>
+<h5>Caution</h5>
<div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864899">Caution</a></h3>
+<h3 class="title">
+<a name="id2878077"></a>Caution</h3>
<p>Consider yourself cautioned.</p>
</div>
-<h3>SimPara in Caution</h3>
+<h5>SimPara in Caution</h5>
<div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864929">Simple Caution</a></h3>
+<h3 class="title">
+<a name="id2878107"></a>Simple Caution</h3>
<p>A simpler caution.</p>
</div>
</div>
<div class="simplesect">
-<a name="id2864954"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2864954"></a><span class="title">Other Objects</span>
-</h2></div></div>
-<h3>Screen</h3>
+<a name="id2878131"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2878131"></a>Other Objects</h2></div></div>
+<h5>Screen</h5>
<pre class="screen">This
is With a line-annotation
a
@@ -753,12 +795,12 @@ This
is With a line-annotation
a
screen</pre>
-<h3>ProgramListing</h3>
+<h5>ProgramListing</h5>
<pre class="programlisting">This
is
a
programlisting</pre>
-<h3>Address</h3>
+<h5>Address</h5>
<div class="address">Norman Walsh<br>
ArborText, Inc.<br>
1000 Victors Way<br>
@@ -770,48 +812,66 @@ Fax: 313.997.0201<br>
<br>
Email: <tt>&lt;<a href="mailto:nwalsh@arbortext.com">nwalsh@arbortext.com</a>&gt;</tt><br>
WWW: http://www.arbortext.com/</div>
-<h3>BlockQuote</h3>
+<h5>BlockQuote</h5>
<blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote>
-<h3>Procedure</h3>
-<div class="procedure"><ol>
-<li><p>This is the first step</p></li>
+<h5>Procedure</h5>
+<div class="procedure">
+<a name="id2878369"></a><ol>
<li>
-<p>This is the second step</p>
-<ol>
-<li><p>This is the first substep</p></li>
-<li><p>This is the second substep</p></li>
+<a name="id2878375"></a><p>This is the first step</p>
+</li>
+<li>
+<a name="id2878391"></a><p>This is the second step</p>
+<ol type="a">
+<li>
+<a name="id2878412"></a><p>This is the first substep</p>
+</li>
+<li>
+<a name="id2878428"></a><p>This is the second substep</p>
+</li>
</ol>
</li>
-<li><p>This is the third step</p></li>
-</ol></div>
-<h3>Procedure With Title</h3>
+<li>
+<a name="id2878350"></a><p>This is the third step</p>
+</li>
+</ol>
+</div>
+<h5>Procedure With Title</h5>
<div class="procedure">
-<p><b>Same Procedure with a Title</b></p>
+<a name="id2878473"></a><p><b>Same Procedure with a Title</b></p>
<ol>
-<li><p>This is the first step</p></li>
<li>
-<p>This is the second step</p>
-<ol>
-<li><p>This is the first substep</p></li>
-<li><p>This is the second substep</p></li>
+<a name="id2878487"></a><p>This is the first step</p>
+</li>
+<li>
+<a name="id2878503"></a><p>This is the second step</p>
+<ol type="a">
+<li>
+<a name="id2878523"></a><p>This is the first substep</p>
+</li>
+<li>
+<a name="id2878539"></a><p>This is the second substep</p>
+</li>
</ol>
</li>
-<li><p>This is the third step</p></li>
+<li>
+<a name="id2878559"></a><p>This is the third step</p>
+</li>
</ol>
</div>
-<h3>SideBar</h3>
+<h5>SideBar</h5>
<div class="sidebar">
-<a name="id2865413"></a><p class="title"><b>What About Bob?</b></p>
+<a name="id2878591"></a><p class="title"><b>What About Bob?</b></p>
<p>This is a sidebar.</p>
</div>
-<h3>MsgSet</h3>
+<h5>MsgSet</h5>
<p>It's not really clear how <tt>MsgSet</tt> should be presented.
I expect that it's fairly application, if not document, specific.</p>
<div class="msgentry">
-<a name="id2865473"></a><div class="msg">
-<a name="id2865479"></a><p>Record failed CRC</p>
+<a name="id2878651"></a><div class="msg">
+<a name="id2878657"></a><p>Record failed CRC</p>
<p>Record <i><tt>n</tt></i>
in <i><tt>database</tt></i>
</p>
@@ -821,7 +881,7 @@ I expect that it's fairly application, if not document, specific.</p>
<p>Panic! Corrupt record!</p>
</div>
<div class="msginfo">
-<a name="id2865602"></a><p>
+<a name="id2878780"></a><p>
<b>Level: </b>severe</p>
<p>
<b>Origin: </b>server</p>
@@ -829,13 +889,13 @@ I expect that it's fairly application, if not document, specific.</p>
<b>Audience: </b>all</p>
</div>
<div class="msgexplan">
-<a name="id2865634"></a><p> Indicates that some sort of error occured attempting to load
+<a name="id2878811"></a><p> Indicates that some sort of error occured attempting to load
a record from the database. Retry. If failure persists,
contact the database administrator.
</p>
</div>
</div>
-<h3>LiteralLayout</h3>
+<h5>LiteralLayout</h5>
<div class="literallayout">This is a<br>
literal<br>
       layout</div>
@@ -845,253 +905,250 @@ literal<br>
  in a para</div></p>
</div>
</div>
-<div id="id2865693" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2865693"></a>Chapter 5. List Tests</h2></div></div>
+<a name="id2878871"></a>Chapter 5. List Tests</h2></div></div>
<div class="simplesect">
-<a name="id2865707"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2865707"></a><span class="title">OrderedLists</span>
-</h2></div></div>
-<h3>Default Numeration</h3>
+<a name="id2878885"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2878885"></a>OrderedLists</h2></div></div>
+<h5>Default Numeration</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2865741"></a>One</p></li>
+<a name="id2878919"></a>One</p></li>
<li>
-<a name="id2865757"></a><pre class="programlisting">this one starts with
+<a name="id2878934"></a><pre class="programlisting">this one starts with
a program listing
what happens?</pre>
</li>
<li>
-<a name="id2865774"></a><pre class="synopsis">this one starts with
+<a name="id2878952"></a><pre class="synopsis">this one starts with
a synopsis
what happens?</pre>
</li>
<li>
<p>
-<a name="id2865790"></a>para first</p>
+<a name="id2878968"></a>para first</p>
<pre class="synopsis">this one has
a synopsis
what happens?</pre>
</li>
<li>
<p>
-<a name="id2865815"></a>Three</p>
+<a name="id2878992"></a>Three</p>
<pre class="screen">A
Screen
Here</pre>
</li>
<li><p>
-<a name="id2865838"></a>Four</p></li>
+<a name="id2879016"></a>Four</p></li>
</ol></div>
-<h3>Arabic Numeration</h3>
+<h5>Arabic Numeration</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2865871"></a>One</p></li>
+<a name="id2879049"></a>One</p></li>
<li><p>
-<a name="id2865897"></a>Two</p></li>
+<a name="id2879075"></a>Two</p></li>
<li><p>
-<a name="id2865912"></a>Three</p></li>
+<a name="id2879089"></a>Three</p></li>
<li><p>
-<a name="id2865928"></a>Four</p></li>
+<a name="id2879105"></a>Four</p></li>
</ol></div>
-<h3>Arabic Numeration (Long)</h3>
+<h5>Arabic Numeration (Long)</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2865960"></a>One</p></li>
+<a name="id2879138"></a>One</p></li>
<li><p>
-<a name="id2865986"></a>Two</p></li>
+<a name="id2879164"></a>Two</p></li>
<li><p>
-<a name="id2866002"></a>Three</p></li>
+<a name="id2879180"></a>Three</p></li>
<li><p>
-<a name="id2866018"></a>Four</p></li>
+<a name="id2879195"></a>Four</p></li>
<li><p>
-<a name="id2866033"></a>Five</p></li>
+<a name="id2879211"></a>Five</p></li>
<li><p>
-<a name="id2866049"></a>Six</p></li>
+<a name="id2879227"></a>Six</p></li>
<li><p>
-<a name="id2866065"></a>Seven</p></li>
+<a name="id2879242"></a>Seven</p></li>
<li><p>
-<a name="id2866080"></a>Eight</p></li>
+<a name="id2879258"></a>Eight</p></li>
<li><p>
-<a name="id2866096"></a>Nine</p></li>
+<a name="id2879274"></a>Nine</p></li>
<li><p>
-<a name="id2866112"></a>Ten</p></li>
+<a name="id2879289"></a>Ten</p></li>
<li><p>
-<a name="id2866128"></a>Eleven</p></li>
+<a name="id2879305"></a>Eleven</p></li>
</ol></div>
-<h3>UpperAlpha Numeration</h3>
+<h5>UpperAlpha Numeration</h5>
<div class="orderedlist"><ol type="A">
<li><p>
-<a name="id2866160"></a>One</p></li>
+<a name="id2879338"></a>One</p></li>
<li><p>
-<a name="id2866186"></a>Two</p></li>
+<a name="id2879364"></a>Two</p></li>
<li><p>
-<a name="id2866202"></a>Three</p></li>
+<a name="id2879380"></a>Three</p></li>
<li><p>
-<a name="id2866218"></a>Four</p></li>
+<a name="id2879395"></a>Four</p></li>
</ol></div>
-<h3>LowerAlpha Numeration</h3>
+<h5>LowerAlpha Numeration</h5>
<div class="orderedlist"><ol type="a">
<li><p>
-<a name="id2866251"></a>One</p></li>
+<a name="id2879428"></a>One</p></li>
<li><p>
-<a name="id2866276"></a>Two</p></li>
+<a name="id2879454"></a>Two</p></li>
<li><p>
-<a name="id2866292"></a>Three</p></li>
+<a name="id2879470"></a>Three</p></li>
<li><p>
-<a name="id2866308"></a>Four</p></li>
+<a name="id2879485"></a>Four</p></li>
</ol></div>
-<h3>UpperRoman Numeration</h3>
+<h5>UpperRoman Numeration</h5>
<div class="orderedlist"><ol type="I">
<li><p>
-<a name="id2866341"></a>One</p></li>
+<a name="id2879518"></a>One</p></li>
<li><p>
-<a name="id2866367"></a>Two</p></li>
+<a name="id2879544"></a>Two</p></li>
<li><p>
-<a name="id2866382"></a>Three</p></li>
+<a name="id2879560"></a>Three</p></li>
<li><p>
-<a name="id2866398"></a>Four</p></li>
+<a name="id2879576"></a>Four</p></li>
</ol></div>
-<h3>LowerRoman Numeration</h3>
+<h5>LowerRoman Numeration</h5>
<div class="orderedlist"><ol type="i">
<li><p>
-<a name="id2866431"></a>One</p></li>
+<a name="id2879608"></a>One</p></li>
<li><p>
-<a name="id2866457"></a>Two</p></li>
+<a name="id2879634"></a>Two</p></li>
<li><p>
-<a name="id2866472"></a>Three</p></li>
+<a name="id2879650"></a>Three</p></li>
<li><p>
-<a name="id2866488"></a>Four</p></li>
+<a name="id2879666"></a>Four</p></li>
</ol></div>
-<h3>Continued</h3>
+<h5>Continued</h5>
<p>First list:
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2866532"></a>One</p></li>
+<a name="id2879709"></a>One</p></li>
<li><p>
-<a name="id2866547"></a>Two</p></li>
+<a name="id2879725"></a>Two</p></li>
<li><p>
-<a name="id2866563"></a>Three</p></li>
+<a name="id2879741"></a>Three</p></li>
<li><p>
-<a name="id2866579"></a>Four</p></li>
+<a name="id2879756"></a>Four</p></li>
</ol></div>
</p>
<p>Second list:
<div class="orderedlist"><ol start="5" type="1">
<li><p>
-<a name="id2866603"></a>Five</p></li>
+<a name="id2879781"></a>Five</p></li>
<li><p>
-<a name="id2866629"></a>Six</p></li>
+<a name="id2879806"></a>Six</p></li>
<li><p>
-<a name="id2866644"></a>Seven</p></li>
+<a name="id2879822"></a>Seven</p></li>
<li><p>
-<a name="id2866660"></a>Eight</p></li>
+<a name="id2879838"></a>Eight</p></li>
<li><p>
-<a name="id2866676"></a>Nine</p></li>
+<a name="id2879853"></a>Nine</p></li>
<li><p>
-<a name="id2866692"></a>Ten</p></li>
+<a name="id2879869"></a>Ten</p></li>
</ol></div>
</p>
</div>
<div class="simplesect">
-<a name="id2866710"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2866710"></a><span class="title">ItemizedLists</span>
-</h2></div></div>
-<h3>Default Presentation</h3>
+<a name="id2879887"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2879887"></a>ItemizedLists</h2></div></div>
+<h5>Default Presentation</h5>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2866744"></a>One</p></li>
+<a name="id2879921"></a>One</p></li>
<li>
-<a name="id2866760"></a><pre class="programlisting">One-point-five. This one starts with
+<a name="id2879937"></a><pre class="programlisting">One-point-five. This one starts with
a program listing
what happens?</pre>
</li>
<li><p>
-<a name="id2866777"></a>Two</p></li>
+<a name="id2879954"></a>Two</p></li>
<li><p>
-<a name="id2866793"></a>Three</p></li>
+<a name="id2879970"></a>Three</p></li>
<li><p>
-<a name="id2866808"></a>Four</p></li>
+<a name="id2879986"></a>Four</p></li>
</ul></div>
-<h3>Block Elements in a List</h3>
+<h5>Block Elements in a List</h5>
<div class="itemizedlist"><ul>
<li>
<p>
-<a name="id2866846"></a>One</p>
+<a name="id2880023"></a>One</p>
<p>Another para.</p>
</li>
<li><p>
-<a name="id2866869"></a>Two</p></li>
+<a name="id2880047"></a>Two</p></li>
<li><p>
-<a name="id2866885"></a>Three</p></li>
+<a name="id2880063"></a>Three</p></li>
<li><p>
-<a name="id2866901"></a>Four</p></li>
+<a name="id2880078"></a>Four</p></li>
</ul></div>
-<h3>Alternate Mark and OverRide</h3>
+<h5>Alternate Mark and OverRide</h5>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2866935"></a>TeX and LaTeX</p></li>
+<a name="id2880112"></a>TeX and LaTeX</p></li>
<li style="list-style-type: disc"><p>
-<a name="id2866965"></a>Troff</p></li>
+<a name="id2880142"></a>Troff</p></li>
<li><p>
-<a name="id2866980"></a>Lout</p></li>
+<a name="id2880158"></a>Lout</p></li>
<li style="list-style-type: none"><p>
-<a name="id2867001"></a>Test</p></li>
+<a name="id2880179"></a>Test</p></li>
</ul></div>
-<h3>No mark Presentation</h3>
+<h5>No mark Presentation</h5>
<div class="itemizedlist"><ul>
<li style="list-style-type: none"><p>
-<a name="id2867049"></a>One</p></li>
+<a name="id2880227"></a>One</p></li>
<li style="list-style-type: disc"><p>
-<a name="id2867069"></a>Two</p></li>
+<a name="id2880247"></a>Two</p></li>
<li><p>
-<a name="id2867085"></a>Three</p></li>
+<a name="id2880262"></a>Three</p></li>
<li><p>
-<a name="id2867100"></a>Four</p></li>
+<a name="id2880278"></a>Four</p></li>
</ul></div>
</div>
<div class="simplesect">
-<a name="id2867119"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2867119"></a><span class="title">VariableLists</span>
-</h2></div></div>
+<a name="id2880297"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2880297"></a>VariableLists</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2867140"></a><span class="term">Term1</span>
+<a name="id2880318"></a><span class="term">Term1</span>
</dt>
<dd><p>
-<a name="id2867155"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2880332"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2867178"></a><span class="term">Term2</span>
+<a name="id2880356"></a><span class="term">Term2</span>
</dt>
<dd><p>
-<a name="id2867192"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2880370"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2867216"></a><span class="term">Term3</span>
+<a name="id2880393"></a><span class="term">Term3</span>
</dt>
<dd>
<p>
-<a name="id2867230"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2880408"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2867256"></a>One</p></li>
+<a name="id2880434"></a>One</p></li>
<li><p>
-<a name="id2867272"></a>Two</p></li>
+<a name="id2880450"></a>Two</p></li>
<li><p>
-<a name="id2867288"></a>Three</p></li>
+<a name="id2880465"></a>Three</p></li>
<li><p>
-<a name="id2867304"></a>Four</p></li>
+<a name="id2880481"></a>Four</p></li>
</ul></div>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -1100,10 +1157,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</dd>
<dt>
-<a name="id2867338"></a><span class="term">Term4</span>
+<a name="id2880516"></a><span class="term">Term4</span>
</dt>
<dd><p>
-<a name="id2867352"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2880530"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -1111,16 +1168,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
</dl></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2867384"></a><span class="term">Another List</span>
+<a name="id2880562"></a><span class="term">Another List</span>
</dt>
<dd><p>
-<a name="id2867399"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2880576"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2867422"></a><span class="term">ProgramListing</span>
+<a name="id2880600"></a><span class="term">ProgramListing</span>
</dt>
<dd>
<pre class="programlisting">A ProgramListing
@@ -1135,14 +1192,13 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</dl></div>
</div>
<div class="simplesect">
-<a name="id2867472"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2867472"></a><span class="title">SimpleLists</span>
-</h2></div></div>
-<h3>Inline</h3>
+<a name="id2880650"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2880650"></a>SimpleLists</h2></div></div>
+<h5>Inline</h5>
<p>An inline simple list:
<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span>
</p>
-<h3>Horiz</h3>
+<h5>Horiz</h5>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>One</td>
@@ -1160,7 +1216,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<td>&nbsp;</td>
</tr>
</table>
-<h3>Vert</h3>
+<h5>Vert</h5>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>One</td>
@@ -1180,70 +1236,68 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</table>
</div>
<div class="simplesect">
-<a name="id2867747"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2867747"></a><span class="title">More Complex List Item Content</span>
-</h2></div></div>
+<a name="id2880924"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2880924"></a>More Complex List Item Content</h2></div></div>
<div class="itemizedlist"><ul>
<li>
<p>
-<a name="id2867768"></a>One</p>
+<a name="id2880945"></a>One</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2867791"></a>Two</p>
+<a name="id2880969"></a>Two</p>
<p>Second para</p>
</li>
<li>
-<a name="id2867815"></a><p>Three</p>
+<a name="id2880992"></a><p>Three</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2867838"></a>Four</p>
+<a name="id2881016"></a>Four</p>
<p>Second para</p>
</li>
<li>
-<a name="id2867862"></a><p>
+<a name="id2881039"></a><p>
<b>Formal Element</b> Five</p>
<p>Second para</p>
</li>
<li><p>
-<a name="id2867901"></a>Six</p></li>
+<a name="id2881079"></a>Six</p></li>
</ul></div>
<div class="orderedlist"><ol type="1">
<li>
<p>
-<a name="id2867925"></a>One</p>
+<a name="id2881102"></a>One</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2867948"></a>Two</p>
+<a name="id2881126"></a>Two</p>
<p>Second para</p>
</li>
<li>
-<a name="id2867972"></a><p>Three</p>
+<a name="id2881149"></a><p>Three</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2867995"></a>Four</p>
+<a name="id2881173"></a>Four</p>
<p>Second para</p>
</li>
<li>
-<a name="id2868019"></a><p>
+<a name="id2881196"></a><p>
<b>Formal Element</b> Five</p>
<p>Second para</p>
</li>
<li><p>
-<a name="id2868058"></a>Six</p></li>
+<a name="id2881236"></a>Six</p></li>
</ol></div>
</div>
<div class="simplesect">
-<a name="id2868077"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2868077"></a><span class="title">Segmented List</span>
-</h2></div></div>
+<a name="id2881255"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2881255"></a>Segmented List</h2></div></div>
<p><b>State Birds</b></p>
<p>
<b>State: </b>Alabama</p>
@@ -1447,13 +1501,12 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<b>Bird: </b>Western Meadowlark</p>
</div>
</div>
-<div id="id2869271" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2869271"></a>Chapter 6. Table Tests</h2></div></div>
-<h3>Alternate Alignment on Entry</h3>
-<div class="informaltable" id="id2869305">
-<p>
-<a name="id2869305"></a><table border="1">
+<a name="id2882449"></a>Chapter 6. Table Tests</h2></div></div>
+<h5>Alternate Alignment on Entry</h5>
+<div class="informaltable" id="id2882483">
+<a name="id2882483"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1477,11 +1530,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<div class="informaltable" id="id2869527">
-<p>
-<a name="id2869527"></a><table border="1">
+<div class="informaltable" id="id2882704">
+<a name="id2882704"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1505,11 +1556,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<div class="informaltable" id="id2869744">
-<p>
-<a name="id2869744"></a><table border="1">
+<div class="informaltable" id="id2882922">
+<a name="id2882922"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1533,12 +1582,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Absolute Widths</h3>
-<div class="informaltable" id="id2869995">
-<p>
-<a name="id2869995"></a><table border="1">
+<h5>Absolute Widths</h5>
+<div class="informaltable" id="id2883172">
+<a name="id2883172"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1567,12 +1614,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Relative Widths</h3>
-<div class="informaltable" id="id2870234">
-<p>
-<a name="id2870234"></a><table border="1">
+<h5>Relative Widths</h5>
+<div class="informaltable" id="id2883411">
+<a name="id2883411"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1588,12 +1633,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Complex</h3>
-<div class="informaltable" id="id2870397">
-<p>
-<a name="id2870397"></a><table width="100%" border="1">
+<h5>Complex</h5>
+<div class="informaltable" id="id2883575">
+<a name="id2883575"></a><table width="100%" border="1">
<colgroup>
<col>
<col align="right">
@@ -1626,7 +1669,6 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<td rowspan="3" colspan="2" valign="middle">C5</td>
</tr>
<tr>
-<td> </td>
<td colspan="0">D2</td>
<td>D3</td>
<td>D4</td>
@@ -1646,12 +1688,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>With Footnotes</h3>
-<div class="informaltable" id="id2870856">
-<p>
-<a name="id2870856"></a><table border="1">
+<h5>With Footnotes</h5>
+<div class="informaltable" id="id2884033">
+<a name="id2884033"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1679,12 +1719,10 @@ word</p></div>
number</p></div>
</td></tr>
</table>
-<p>
</div>
-<h3>A Big One</h3>
-<div class="informaltable" id="id2871018">
-<p>
-<a name="id2871018"></a><table border="1">
+<h5>A Big One</h5>
+<div class="informaltable" id="id2884196">
+<a name="id2884196"></a><table border="1">
<colgroup>
<col>
<col>
@@ -2232,42 +2270,38 @@ number</p></div>
</tr>
</tbody>
</table>
-<p>
</div>
</div>
-<div id="id2874933" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2874933"></a>Chapter 7. Index Term Tests</h2></div></div>
+<a name="id2888110"></a>Chapter 7. Index Term Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2875004">Index Term Sect 1</a>
+<dt> <a href="#id2888181">Index Term Sect 1</a>
</dt>
<dd><dl>
-<dt> <a href="#id2875306">Index Term Sect 2</a>
+<dt> <a href="#id2888483">Index Term Sect 2</a>
</dt>
-<dt> <a href="#id2875449">Index Term Sect 3</a>
+<dt> <a href="#id2888627">Index Term Sect 3</a>
</dt>
</dl></dd>
</dl>
</div>
<p>Test data.</p>
<a class="indexterm" name="idx1"></a><a class="indexterm" name="idx2"></a><div class="sect1">
-<a name="id2875004"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2875004"></a><span class="title">Index Term Sect 1</span>
-</h2></div></div>
+<a name="id2888181"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2888181"></a>Index Term Sect 1</h2></div></div>
<p>Test data.</p>
-<a class="indexterm" name="idx3"></a><a class="indexterm" name="fred"></a><a class="indexterm" name="idx5"></a><a class="indexterm" name="idx6"></a><a class="indexterm" name="idx7"></a><a class="indexterm" name="idx8"></a><a class="indexterm" name="idx9"></a><a class="indexterm" name="id2875250"></a><a class="indexterm" name="idx11"></a><div class="sect2">
-<a name="id2875306"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2875306"></a><span class="title">Index Term Sect 2</span>
-</h3></div></div>
+<a class="indexterm" name="idx3"></a><a class="indexterm" name="fred"></a><a class="indexterm" name="idx5"></a><a class="indexterm" name="idx6"></a><a class="indexterm" name="idx7"></a><a class="indexterm" name="idx8"></a><a class="indexterm" name="idx9"></a><a class="indexterm" name="id2888427"></a><a class="indexterm" name="idx11"></a><div class="sect2">
+<a name="id2888483"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2888483"></a>Index Term Sect 2</h3></div></div>
<p>Test data.</p>
<a class="indexterm" name="idx12"></a><a class="indexterm" name="idx13"></a><a class="indexterm" name="idx14"></a><a class="indexterm" name="idx15"></a>
</div>
<div class="sect2">
-<a name="id2875449"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2875449"></a><span class="title">Index Term Sect 3</span>
-</h3></div></div>
+<a name="id2888627"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2888627"></a>Index Term Sect 3</h3></div></div>
<p>foo</p>
</div>
</div>
@@ -2279,69 +2313,61 @@ number</p></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>8. <a href="#id2875501">CmdSynopsis Tests</a>
+<dt>8 <a href="#id2888679">CmdSynopsis Tests</a>
</dt>
-<dt>9. <a href="#id2876258">FuncSynopsis Tests</a>
+<dt>9 <a href="#id2889436">FuncSynopsis Tests</a>
</dt>
-<dt>10. <a href="#id2876554">Callout Tests</a>
+<dt>10 <a href="#id2889732">Callout Tests</a>
</dt>
</dl>
</div>
-<div id="id2875501" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2875501"></a>Chapter 8. CmdSynopsis Tests</h2></div></div>
-<h3>Very Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2875530">
-<a name="id2875530"></a><tt>cd</tt> {<i><tt>directory</tt></i>}</div>
-<h3>Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2875575">
-<a name="id2875575"></a><tt>cal</tt> [-j] [-y] [month [year]]</div>
-<h3>Another Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2875633">
-<a name="id2875633"></a><tt>chgrp</tt> [-R
+<a name="id2888679"></a>Chapter 8. CmdSynopsis Tests</h2></div></div>
+<h5>Very Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2888708">
+<a name="id2888708"></a><tt>cd</tt> {<i><tt>directory</tt></i>}</div>
+<h5>Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2888753">
+<a name="id2888753"></a><tt>cal</tt> [-j] [-y] [month [year]]</div>
+<h5>Another Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2888810">
+<a name="id2888810"></a><tt>chgrp</tt> [-R
[-H | -L | -P]
] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div>
-<h3>Slightly Complex CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2875744">
-<a name="id2875744"></a><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div>
-<h3>Quite Complex CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2875875">
-<a name="id2875875"></a><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div>
-</div>
-<div id="id2876258" class="chapter">
+<h5>Slightly Complex CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2888921">
+<a name="id2888921"></a><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div>
+<h5>Quite Complex CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2889052">
+<a name="id2889052"></a><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2876258"></a>Chapter 9. FuncSynopsis Tests</h2></div></div>
-<h3>Two Simple Parameters</h3>
-<div class="funcsynopsis" id="id2876287">
-<p>
-<a name="id2876287"></a><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br>int <var class="pdparam">int1</var>;<br>int <var class="pdparam">int2</var>;</code></p>
-<p>
-</div>
-<h3>Variable Arguments</h3>
-<div class="funcsynopsis" id="id2876356">
-<p>
-<a name="id2876356"></a><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre>
+<a name="id2889436"></a>Chapter 9. FuncSynopsis Tests</h2></div></div>
+<h5>Two Simple Parameters</h5>
+<div class="funcsynopsis" id="id2889464">
+<a name="id2889464"></a><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br>int <var class="pdparam">int1</var>;<br>int <var class="pdparam">int2</var>;</code></p>
+</div>
+<h5>Variable Arguments</h5>
+<div class="funcsynopsis" id="id2889534">
+<a name="id2889534"></a><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre>
<p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p>
-<p>
</div>
-<h3>Void</h3>
-<div class="funcsynopsis" id="id2876420">
-<p>
-<a name="id2876420"></a><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p>
-<p>
+<h5>Void</h5>
+<div class="funcsynopsis" id="id2889598">
+<a name="id2889598"></a><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p>
</div>
-<h3>Function Pointer Arguments</h3>
-<div class="funcsynopsis" id="id2876455">
-<p>
-<a name="id2876455"></a><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br>void *<var class="pdparam">dataptr</var>[];<br>int <var class="pdparam">left</var>;<br>int <var class="pdparam">right</var>;<br>int <var class="pdparam">(* comp)</var>
+<h5>Function Pointer Arguments</h5>
+<div class="funcsynopsis" id="id2889633">
+<a name="id2889633"></a><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br>void *<var class="pdparam">dataptr</var>[];<br>int <var class="pdparam">left</var>;<br>int <var class="pdparam">right</var>;<br>int <var class="pdparam">(* comp)</var>
(void *, void *);</code></p>
-<p>
</div>
</div>
-<div id="id2876554" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2876554"></a>Chapter 10. Callout Tests</h2></div></div>
-<h3>CallOut (using AREASPEC)</h3>
+<a name="id2889732"></a>Chapter 10. Callout Tests</h2></div></div>
+<h5>CallOut (using AREASPEC)</h5>
<div class="programlistingco">
<pre class="programlisting">@rem = '--*-Perl-*--
@echo off
@@ -2374,44 +2400,57 @@ while (@DIRS) {
}
exit;</pre>
-<div class="calloutlist"><table border="0" summary="Callout list">
+<div class="calloutlist">
+<a name="id2889940"></a><table border="0" summary="Callout list">
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/1.png" alt="1" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2889948"></a><img src="../images/callouts/1.png" alt="1" border="0">
+</td>
<td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/2.png" alt="2" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2889977"></a><img src="../images/callouts/2.png" alt="2" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
file interpreter, skips over the body of the Perl script.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/3.png" alt="3" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2890014"></a><img src="../images/callouts/3.png" alt="3" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
fragments.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/4.png" alt="4" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2890050"></a><img src="../images/callouts/4.png" alt="4" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
both a line and a column.)</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/5.png" alt="5" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2890088"></a><img src="../images/callouts/5.png" alt="5" border="0">
+</td>
<td valign="top" align="left"><p>This is a user subroutine call.</p></td>
</tr>
-</table></div>
+</table>
</div>
-<h3>CallOut (using CO)</h3>
+</div>
+<h5>CallOut (using CO)</h5>
<pre class="programlisting">this is a line
this is another line
there's a <a name="callout1"></a><img src="../images/callouts/1.png" alt="1" border="0">callout in here.
and there's another on the
next line
right here:<a name="callout2"></a><img src="../images/callouts/2.png" alt="2" border="0"></pre>
-<div class="calloutlist"><table border="0" summary="Callout list">
+<div class="calloutlist">
+<a name="id2890153"></a><table border="0" summary="Callout list">
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
+<a name="id2890174"></a><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
<td valign="top" align="left">
<p>First callout.</p>
<p>Second para in first callout.</p>
@@ -2419,7 +2458,7 @@ right here:<a name="callout2"></a><img src="../images/callouts/2.png" alt="2" bo
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2890210"></a><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
<td valign="top" align="left">
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -2432,19 +2471,26 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2890259"></a><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
<td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td>
</tr>
-</table></div>
+</table>
+</div>
</div>
</div>
-<div class="part" id="id2877118">
+<div class="part" id="id2890295">
<div class="titlepage"><div><h1 class="title">
-<a name="id2877118"></a>A Reference Part</h1></div></div>
+<a name="id2890295"></a>A Reference Part</h1></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt>I. <a href="#reference">Reference</a>
-</dt></dl>
+<dl>
+<dt>I <a href="#reference">Reference</a>
+</dt>
+<dd><dl>
+<dt><a href="#id2890332">RefEntryTitle</a></dt>
+<dt><a href="#id2890517"><tt>Chop</tt></a></dt>
+</dl></dd>
+</dl>
</div>
<div class="reference">
<a name="reference"></a><div class="titlepage">
@@ -2455,44 +2501,44 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt><a href="#id2877155">RefEntryTitle</a></dt>
-<dt><a href="#id2877340"><tt>Chop</tt></a></dt>
+<dt><a href="#id2890332">RefEntryTitle</a></dt>
+<dt><a href="#id2890517"><tt>Chop</tt></a></dt>
</dl>
</div>
<div class="refentry">
<h1 class="title">
-<a name="id2877155"></a>RefEntryTitle</h1>
+<a name="id2890332"></a>RefEntryTitle</h1>
<div class="refnamediv">
-<a name="id2877177"></a><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div>
+<a name="id2890355"></a><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div>
<div class="refsynopsisdiv">
-<a name="id2877218"></a><h2>Synopsis</h2>
+<a name="id2890395"></a><h2>Synopsis</h2>
<pre class="synopsis"> A
Synopsis
Goes
Here</pre>
</div>
<div class="refsect1">
-<a name="id2877234"></a><h2>
-<a name="id2877234"></a>A RefSect1</h2>
+<a name="id2890412"></a><h2>
+<a name="id2890412"></a>A RefSect1</h2>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="refsect2">
-<a name="id2877262"></a><h3>
-<a name="id2877262"></a>A RefSect2</h3>
+<a name="id2890439"></a><h3>
+<a name="id2890439"></a>A RefSect2</h3>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="refsect3">
-<a name="id2877289"></a><h4>
-<a name="id2877289"></a>A RefSect3</h4>
+<a name="id2890467"></a><h4>
+<a name="id2890467"></a>A RefSect3</h4>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.<sup>[<a name="id2877312" href="#ftn.id2877312">6</a>]</sup>
+Blah blah blah blah.<sup>[<a name="id2890490" href="#ftn.id2890490">6</a>]</sup>
Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
@@ -2502,23 +2548,23 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2877312" href="#id2877312">6</a>] </sup>This is a footnote in a refentry.</p></div>
+<sup>[<a name="ftn.id2890490" href="#id2890490">6</a>] </sup>This is a footnote in a refentry.</p></div>
</div>
</div>
<div class="refentry">
<h1 class="title">
-<a name="id2877340"></a><tt>Chop</tt>
+<a name="id2890517"></a><tt>Chop</tt>
</h1>
<div class="refnamediv">
-<a name="id2877346"></a><h2>Name</h2>
+<a name="id2890524"></a><h2>Name</h2>
<tt>Chop</tt> &#x2014; strip trailing whitespace</div>
<div class="refsect1">
-<a name="id2877372"></a><h2>
-<a name="id2877372"></a>Description</h2>
+<a name="id2890550"></a><h2>
+<a name="id2890550"></a>Description</h2>
<p> Returns the argument string without trailing whitespace.
<div class="example">
<p>
-<a name="id2877394"></a><b>Example 2. chop() example</b>
+<a name="id2890571"></a><b>Example 2. chop() example</b>
</p>
<pre class="programlisting">$trimmed = Chop($line);</pre>
</div>
@@ -2527,28 +2573,28 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</div>
</div>
</div>
-<div id="appendix" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
<a name="appendix"></a>Appendix A. A Very Short Appendix</h2></div></div>
<p>Blah.</p>
</div>
-<div id="id2877460" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2877460"></a>Appendix B. A Very Long Appendix</h2></div></div>
+<a name="id2890637"></a>Appendix B. A Very Long Appendix</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2878110">a sect1 title</a>
+<dt> <a href="#id2891288">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2878141">a sect2 title</a>
+<dd><dl><dt> <a href="#id2891318">a sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2878280">another sect1 title</a>
+<dt> <a href="#id2891458">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2878335">another sect2 title</a>
+<dd><dl><dt> <a href="#id2891512">another sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2878570">another sect1 title</a>
+<dt> <a href="#id2891747">another sect1 title</a>
</dt>
-<dt> <a href="#id2878602">another sect1 title</a>
+<dt> <a href="#id2891780">another sect1 title</a>
</dt>
</dl>
</div>
@@ -2783,9 +2829,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="sect1">
-<a name="id2878110"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2878110"></a><span class="title">a sect1 title</span>
-</h2></div></div>
+<a name="id2891288"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2891288"></a>a sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2793,9 +2838,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2878141"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2878141"></a><span class="title">a sect2 title</span>
-</h3></div></div>
+<a name="id2891318"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2891318"></a>a sect2 title</h3></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2803,9 +2847,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2878171"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2878171"></a><span class="title">a sect3 title</span>
-</h4></div></div>
+<a name="id2891349"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2891349"></a>a sect3 title</h4></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2813,9 +2856,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2878211"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2878211"></a><span class="title">a sect4 title</span>
-</h5></div></div>
+<a name="id2891388"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2891388"></a>a sect4 title</h5></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2823,9 +2865,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2878241"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2878241"></a><span class="title">a sect5 title</span>
-</h6></div></div>
+<a name="id2891419"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2891419"></a>a sect5 title</h6></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2838,10 +2879,9 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="id2878280"></a><div class="titlepage">
-<div><h2 class="title" style="clear: all">
-<a name="id2878280"></a><span class="title">another sect1 title</span>
-</h2></div>
+<a name="id2891458"></a><div class="titlepage">
+<div><h2 class="title" style="clear: both">
+<a name="id2891464"></a>another sect1 title</h2></div>
<div><h2 class="subtitle">a sect1 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2851,10 +2891,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2878335"></a><div class="titlepage">
+<a name="id2891512"></a><div class="titlepage">
<div><h3 class="title">
-<a name="id2878335"></a><span class="title">another sect2 title</span>
-</h3></div>
+<a name="id2891518"></a>another sect2 title</h3></div>
<div><h2 class="subtitle">a sect2 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2864,10 +2903,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2878389"></a><div class="titlepage">
+<a name="id2891567"></a><div class="titlepage">
<div><h4 class="title">
-<a name="id2878389"></a><span class="title">another sect3 title</span>
-</h4></div>
+<a name="id2891573"></a>another sect3 title</h4></div>
<div><h2 class="subtitle">a sect3 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2877,10 +2915,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2878444"></a><div class="titlepage">
+<a name="id2891621"></a><div class="titlepage">
<div><h5 class="title">
-<a name="id2878444"></a><span class="title">another sect4 title</span>
-</h5></div>
+<a name="id2891627"></a>another sect4 title</h5></div>
<div><h2 class="subtitle">a sect4 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2890,10 +2927,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2878498"></a><div class="titlepage">
+<a name="id2891676"></a><div class="titlepage">
<div><h6 class="title">
-<a name="id2878498"></a><span class="title">another sect5 title</span>
-</h6></div>
+<a name="id2891682"></a>another sect5 title</h6></div>
<div><h2 class="subtitle">a sect5 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2908,9 +2944,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="id2878570"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2878570"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="id2891747"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2891747"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2919,9 +2954,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
<div class="sect1">
-<a name="id2878602"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2878602"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="id2891780"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2891780"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2930,20 +2964,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
</div>
-<div class="bibliography">
-<h2 class="title"><a name="bib1">A Test Bibliography</a></h2>
+<div id="bib1" class="bibliography">
+<div class="titlepage"><div><h2 class="title">
+<a name="bib1"></a>A Test Bibliography</h2></div></div>
<p>The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</p>
<div class="bibliodiv">
-<h3 class="title"><a name="id2878670">Books</a></h3>
-<div id="id2878684" class="biblioentry">
-<a name="id2878684"></a><p>
-<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
+<h3 class="title"><a name="id2891847">Books</a></h3>
+<div id="id2891861" class="biblioentry">
+<a name="id2891861"></a><p>
+<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
</p>
</div>
</div>
<div class="bibliodiv">
-<h3 class="title"><a name="id2878916">Periodicals</a></h3>
+<h3 class="title"><a name="id2892094">Periodicals</a></h3>
<div id="walsh97" class="biblioentry">
<a name="walsh97"></a><p>
<span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span>
@@ -2959,8 +2994,8 @@ a lot of tweaking. It probably doesn't conform to any specific style.</p>
<span class="corpname">The World Wide Web Consortium</span>.
<span class="pubdate">Winter, 1996</span></span>.</p>
</div>
-<div id="id2879229" class="biblioentry">
-<a name="id2879229"></a><p>
+<div id="id2892407" class="biblioentry">
+<a name="id2892407"></a><p>
<span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
@@ -2993,22 +3028,25 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</div>
</div>
</div>
-<div class="glossary">
-<h2>Example Glossary</h2>
-<dl>
+<div id="gloss" class="glossary">
+<div class="titlepage"><div><h2 class="title">
+<a name="gloss"></a>Example Glossary</h2></div></div>
<p>This is not a real glossary, it's just an example.</p>
<div class="glossdiv">
<h3 class="title">E</h3>
+<dl>
<dt><a name="xml">Extensible Markup Language</a></dt>
<dd>
<p>Some reasonable definition here.</p>
<p>See Also <a href="#sgml">Standard Generalized
Markup Language</a>.</p>
</dd>
+</dl>
</div>
<div class="glossdiv">
<h3 class="title">S</h3>
-<dt><a name="id2880170">SGML</a></dt>
+<dl>
+<dt><a name="id2893348">SGML</a></dt>
<dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd>
<dt><a name="sgml">Standard Generalized
@@ -3017,11 +3055,12 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
<p>Some reasonable definition here.</p>
<p>See Also <a href="#xml">Extensible Markup Language</a>.</p>
</dd>
-</div>
</dl>
</div>
-<div class="index">
-<h2 class="title"><a name="index">Index</a></h2>
+</div>
+<div id="index" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="index"></a>Index</h2></div></div>
<p>This is a test index.</p>
<p>
<b>a formal para</b> this is a formal paragraph.</p>
@@ -3068,8 +3107,9 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</dl></dd>
</dl></dd>
</div>
-<div class="index">
-<h2 class="title"><a name="id2880654">An Index with a Title</a></h2>
+<div id="id2893831" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="id2893831"></a>An Index with a Title</h2></div></div>
<div class="indexdiv">Symbols<dl>
<dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
diff --git a/tests/docbook/result/html/book3.html b/tests/docbook/result/html/book3.html
index 3666906e..8cce50cc 100644
--- a/tests/docbook/result/html/book3.html
+++ b/tests/docbook/result/html/book3.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -11,7 +11,7 @@
<a name="book"></a>Book Title</h1></div>
<div><h3 class="corpauthor">Some Corporation</h3></div>
<div><h3 class="author">Norman Walsh</h3></div>
-<div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1998 Norman Walsh</p></div>
<div><div class="legalnotice">
<p class="legalnotice-title"><b>Legal Notice</b></p>
<p>This is a test document. You can do what you will with it.</p>
@@ -33,23 +33,24 @@
<dt><a href="#bib1">A Test Bibliography</a></dt>
<dt><a href="#gloss">Example Glossary</a></dt>
<dt><a href="#index">Index</a></dt>
-<dt><a href="#id2753497">Index</a></dt>
+<dt><a href="#id2766550">Index</a></dt>
</dl>
</div>
-<div class="bibliography">
-<h2 class="title"><a name="bib1">A Test Bibliography</a></h2>
+<div id="bib1" class="bibliography">
+<div class="titlepage"><div><h2 class="title">
+<a name="bib1"></a>A Test Bibliography</h2></div></div>
<p>The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</p>
<div class="bibliodiv">
-<h3 class="title"><a name="id2848637">Books</a></h3>
-<div id="id2848651" class="biblioentry">
-<a name="id2848651"></a><p>
-<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span>
+<h3 class="title"><a name="id2861818">Books</a></h3>
+<div id="id2861831" class="biblioentry">
+<a name="id2861831"></a><p>
+<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span>
</p>
</div>
</div>
<div class="bibliodiv">
-<h3 class="title"><a name="id2758022">Periodicals</a></h3>
+<h3 class="title"><a name="id2767042">Periodicals</a></h3>
<div id="walsh97" class="biblioentry">
<a name="walsh97"></a><p>
<span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span>
@@ -65,8 +66,8 @@ a lot of tweaking. It probably doesn't conform to any specific style.</p>
<span class="corpname">The World Wide Web Consortium</span>.
<span class="pubdate">Winter, 1996</span></span>.</p>
</div>
-<div id="id2760720" class="biblioentry">
-<a name="id2760720"></a><p>
+<div id="id2771178" class="biblioentry">
+<a name="id2771178"></a><p>
<span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
@@ -99,22 +100,25 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</div>
</div>
</div>
-<div class="glossary">
-<h2>Example Glossary</h2>
-<dl>
+<div id="gloss" class="glossary">
+<div class="titlepage"><div><h2 class="title">
+<a name="gloss"></a>Example Glossary</h2></div></div>
<p>This is not a real glossary, it's just an example.</p>
<div class="glossdiv">
<h3 class="title">E</h3>
+<dl>
<dt><a name="xml">Extensible Markup Language</a></dt>
<dd>
<p>Some reasonable definition here.</p>
<p>See Also <a href="#sgml">Standard Generalized
Markup Language</a>.</p>
</dd>
+</dl>
</div>
<div class="glossdiv">
<h3 class="title">S</h3>
-<dt><a name="id2752959">SGML</a></dt>
+<dl>
+<dt><a name="id2766016">SGML</a></dt>
<dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd>
<dt><a name="sgml">Standard Generalized
@@ -123,11 +127,12 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
<p>Some reasonable definition here.</p>
<p>See Also <a href="#xml">Extensible Markup Language</a>.</p>
</dd>
-</div>
</dl>
</div>
-<div class="index">
-<h2 class="title"><a name="index">Index</a></h2>
+</div>
+<div id="index" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="index"></a>Index</h2></div></div>
<p>This is a test index.</p>
<p>
<b>a formal para</b> this is a formal paragraph.</p>
@@ -174,8 +179,9 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</dl></dd>
</dl></dd>
</div>
-<div class="index">
-<h2 class="title"><a name="id2753497">Index</a></h2>
+<div id="id2766550" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="id2766550"></a>Index</h2></div></div>
<div class="indexdiv">Symbols<dl>
<dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
diff --git a/tests/docbook/result/html/callout.html b/tests/docbook/result/html/callout.html
index f456b359..76472a98 100644
--- a/tests/docbook/result/html/callout.html
+++ b/tests/docbook/result/html/callout.html
@@ -3,16 +3,18 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Loops</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section">
-<a name="dsssl.expr.loop"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="dsssl.expr.loop"></a><span class="title">Loops</span>
-</h2></div></div>
+<a name="dsssl.expr.loop"></a><div class="titlepage">
+<div><h2 class="title" style="clear: both">
+<a name="dsssl.expr.loop"></a>Loops</h2></div>
+<hr>
+</div>
<p>
-<a class="indexterm" name="id2760581"></a>
-<a class="indexterm" name="id2760591"></a>
-<a class="indexterm" name="id2760600"></a>
+<a class="indexterm" name="id2767257"></a>
+<a class="indexterm" name="id2767266"></a>
+<a class="indexterm" name="id2767276"></a>
DSSSL doesn't have any construct that resembles the
for loop that occurs in most imperative languages like C
@@ -28,19 +30,20 @@ Loops in DSSSL use a special form of
<a name="dl4"></a><img src="../images/callouts/4.png" alt="4" border="0">#t
(<a name="dl5"></a><img src="../images/callouts/5.png" alt="5" border="0">loopvar <a name="dl6"></a><img src="../images/callouts/6.png" alt="6" border="0">(+ count 1))))</pre>
</p>
-<div class="calloutlist"><table border="0" summary="Callout list">
+<div class="calloutlist">
+<a name="id2887870"></a><table border="0" summary="Callout list">
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
+<a name="id2887878"></a><a href="#dl1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
<td valign="top" align="left"><p>This variable controls the loop. It is declared without an
initial value, immediately after the <tt>let</tt>
operand.</p></td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2766978"></a><a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
<td valign="top" align="left"><p>
-<a class="indexterm" name="id2753774"></a>
+<a class="indexterm" name="id2861754"></a>
Any number of additional local variables can be defined after
the loop variable, just as they can in any other
@@ -48,28 +51,29 @@ the loop variable, just as they can in any other
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl3"><img src="../images/callouts/3.png" alt="3" border="0"></a> </td>
+<a name="id2887911"></a><a href="#dl3"><img src="../images/callouts/3.png" alt="3" border="0"></a> </td>
<td valign="top" align="left"><p>If you ever want the loop to end, you have to put some sort of a
test in it.</p></td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl4"><img src="../images/callouts/4.png" alt="4" border="0"></a> </td>
+<a name="id2861653"></a><a href="#dl4"><img src="../images/callouts/4.png" alt="4" border="0"></a> </td>
<td valign="top" align="left"><p>This is the value that will be returned.</p></td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl5"><img src="../images/callouts/5.png" alt="5" border="0"></a> </td>
+<a name="id2861687"></a><a href="#dl5"><img src="../images/callouts/5.png" alt="5" border="0"></a> </td>
<td valign="top" align="left"><p>Note that you iterate the loop by using the loop variable as if
it was a function name.</p></td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#dl6"><img src="../images/callouts/6.png" alt="6" border="0"></a> </td>
+<a name="id2771096"></a><a href="#dl6"><img src="../images/callouts/6.png" alt="6" border="0"></a> </td>
<td valign="top" align="left"><p>The arguments to this function are the values that
-you want the local variables declared in <a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"></a> to have
+you want the local variables declared in <a href="#dl2" title=""><img src="../images/callouts/2.png" alt="2" border="0"></a> to have
in the next iteration.</p></td>
</tr>
-</table></div>
+</table>
+</div>
</div></body>
</html>
diff --git a/tests/docbook/result/html/chunk.html b/tests/docbook/result/html/chunk.html
index a476b23b..edcff0f5 100644
--- a/tests/docbook/result/html/chunk.html
+++ b/tests/docbook/result/html/chunk.html
@@ -3,12 +3,12 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799186">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2812391">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799186"></a>Book Test Document Title</h1></div>
+<a name="id2812391"></a>Bookinfo Test Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
<hr>
@@ -18,9 +18,9 @@
<a name="dedication"></a>First Dedication</h2></div></div>
<p>Just a test.</p>
</div>
-<div id="id2757378" class="dedication">
+<div id="id2770554" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2757378"></a>Dedication</h2></div></div>
+<a name="id2770554"></a>Dedication</h2></div></div>
<p>Just a test.</p>
</div>
<div class="toc">
@@ -28,69 +28,67 @@
<dl>
<dt> <a href="#preface">Foreword</a>
</dt>
-<dt>1. <a href="#xreftest">XRef Tests</a>
+<dt>1 <a href="#xreftest">XRef Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2755728">First sect1</a>
+<dt> <a href="#id2768992">First sect1</a>
</dt>
-<dt> <a href="#id2755749">Second sect1</a>
+<dt> <a href="#id2769013">Second sect1</a>
</dt>
</dl></dd>
-<dt>2. <a href="#chapter">Second Chapter</a>
+<dt>2 <a href="#chapter">Second Chapter</a>
</dt>
-<dt>3. <a href="#id2755684">Third Chapter</a>
+<dt>3 <a href="#id2770605">Third Chapter</a>
</dt>
-<dt>A. <a href="#appendix">First Appendix</a>
+<dt>A <a href="#appendix">First Appendix</a>
</dt>
-<dt>B. <a href="#id2799324">Second Appendix</a>
+<dt>B <a href="#id2767027">Second Appendix</a>
</dt>
</dl>
</div>
<div id="preface" class="preface">
<div class="titlepage"><div><h2 class="title">
<a name="preface"></a>Foreword</h2></div></div>
-<p>This is a test paragraph. (<a href="#chapter">chapter</a>)</p>
+<p>This is a test paragraph. (<a href="#chapter" title="Chapter 2. Second Chapter">chapter</a>)</p>
</div>
-<div id="xreftest" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="xreftest"></a>Chapter 1. XRef Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2755728">First sect1</a>
+<dt> <a href="#id2768992">First sect1</a>
</dt>
-<dt> <a href="#id2755749">Second sect1</a>
+<dt> <a href="#id2769013">Second sect1</a>
</dt>
</dl>
</div>
<p><a href="#dedication">Dedication</a></p>
-<p><a href="#preface">Preface</a></p>
-<p><a href="#chapter">Chapter</a></p>
-<p><a href="#appendix">Appendix</a></p>
+<p><a href="#preface" title="Foreword">Preface</a></p>
+<p><a href="#chapter" title="Chapter 2. Second Chapter">Chapter</a></p>
+<p><a href="#appendix" title="Appendix A. First Appendix">Appendix</a></p>
<div class="sect1">
-<a name="id2755728"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755728"></a><span class="title">First sect1</span>
-</h2></div></div>
+<a name="id2768992"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2768992"></a>First sect1</h2></div></div>
<p>...</p>
</div>
<div class="sect1">
-<a name="id2755749"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755749"></a><span class="title">Second sect1</span>
-</h2></div></div>
+<a name="id2769013"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2769013"></a>Second sect1</h2></div></div>
<p>...</p>
</div>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 2. Second Chapter</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="id2755684" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755684"></a>Chapter 3. Third Chapter</h2></div></div>
+<a name="id2770605"></a>Chapter 3. Third Chapter</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="appendix" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
<a name="appendix"></a>Appendix A. First Appendix</h2></div></div>
<p>This is just a test.</p>
@@ -145,9 +143,9 @@ This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.</p>
</div>
-<div id="id2799324" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799324"></a>Appendix B. Second Appendix</h2></div></div>
+<a name="id2767027"></a>Appendix B. Second Appendix</h2></div></div>
<p>This is just a test.</p>
</div>
</div></body>
diff --git a/tests/docbook/result/html/classsynop.html b/tests/docbook/result/html/classsynop.html
index 40c44bac..bba1af5d 100644
--- a/tests/docbook/result/html/classsynop.html
+++ b/tests/docbook/result/html/classsynop.html
@@ -3,11 +3,11 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Chapter 1. Class Synopses</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599532" class="chapter">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2599532"></a>Chapter 1. Class Synopses</h2></div></div>
+<a name="id2861742"></a>Chapter 1. Class Synopses</h2></div></div>
<p>This example is Perl; it's the standard DirHandle module. I've
cut out the code, so you'll have to trust me on the parameters.
</p>
diff --git a/tests/docbook/result/html/condition.html b/tests/docbook/result/html/condition.html
index 1910c1ce..3547f55b 100644
--- a/tests/docbook/result/html/condition.html
+++ b/tests/docbook/result/html/condition.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -11,7 +11,7 @@
<a name="book"></a>Book Title</h1></div>
<div><h3 class="corpauthor">Some Corporation</h3></div>
<div><h3 class="author">Norman Walsh</h3></div>
-<div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1998 Norman Walsh</p></div>
<div><div class="legalnotice">
<p class="legalnotice-title"><b>Legal Notice</b></p>
<p>This is a test document. You can do what you will with it.</p>
@@ -27,9 +27,9 @@
</p></div></div>
<hr>
</div>
-<div id="id2599602" class="dedication">
+<div id="id2861914" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2599602"></a>Dedication</h2></div></div>
+<a name="id2861914"></a>Dedication</h2></div></div>
<p>This test book is dedicated to all the testers. This is the first para
of the dedication.</p>
<p>This is the second para of the dedication.</p>
@@ -38,99 +38,154 @@ of the dedication.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2848749">Preface Title</a>
+<dt> <a href="#id2861927">Preface Title</a>
</dt>
-<dt>I. <a href="#id2874895">Part One Title</a>
+<dt>I <a href="#id2888072">Part One Title</a>
</dt>
-<dt>II. <a href="#part">Part Two Title</a>
+<dd><dl>
+<dt>1 <a href="#chapter">XRef Tests</a>
+</dt>
+<dt>2 <a href="#stchap">Section Tests</a>
+</dt>
+<dd><dl>
+<dt> <a href="#secttest1">a sect1 title</a>
+</dt>
+<dd><dl><dt> <a href="#id2766041">a sect2 title</a>
+</dt></dl></dd>
+<dt> <a href="#secttest2">another sect1 title</a>
+</dt>
+<dd><dl><dt> <a href="#id2766555">another sect2 title</a>
+</dt></dl></dd>
+<dt> <a href="#secttest3">another sect1 title</a>
+</dt>
+<dt> <a href="#secttest4">another sect1 title</a>
+</dt>
+</dl></dd>
+<dt>3 <a href="#id2766781">Inline Tests</a>
+</dt>
+<dt>4 <a href="#id2889414">Block Tests</a>
+</dt>
+<dt>5 <a href="#id2890995">List Tests</a>
+</dt>
+<dt>6 <a href="#id2894573">Table Tests</a>
+</dt>
+<dt>7 <a href="#id2900610">Index Term Tests</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2900681">Index Term Sect 1</a>
+</dt>
+<dd><dl>
+<dt> <a href="#id2900983">Index Term Sect 2</a>
+</dt>
+<dt> <a href="#id2901126">Index Term Sect 3</a>
+</dt>
+</dl></dd>
+</dl></dd>
+</dl></dd>
+<dt>II <a href="#part">Part Two Title</a>
+</dt>
+<dd><dl>
+<dt>8 <a href="#id2901178">CmdSynopsis Tests</a>
+</dt>
+<dt>9 <a href="#id2901935">FuncSynopsis Tests</a>
</dt>
-<dt>III. <a href="#id2889615">A Reference Part</a>
+<dt>10 <a href="#id2902234">Callout Tests</a>
</dt>
-<dt>A. <a href="#appendix">A Very Short Appendix</a>
+</dl></dd>
+<dt>III <a href="#id2902790">A Reference Part</a>
+</dt>
+<dd><dl>
+<dt>I <a href="#reference">Reference</a>
+</dt>
+<dd><dl>
+<dt><a href="#id2902827">RefEntryTitle</a></dt>
+<dt><a href="#id2903012"><tt>Chop</tt></a></dt>
+</dl></dd>
+</dl></dd>
+<dt>A <a href="#appendix">A Very Short Appendix</a>
</dt>
-<dt>B. <a href="#id2889957">A Very Long Appendix</a>
+<dt>B <a href="#id2903132">A Very Long Appendix</a>
</dt>
<dd><dl>
-<dt> <a href="#id2890607">a sect1 title</a>
+<dt> <a href="#id2903782">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2890647">a sect2 title</a>
+<dd><dl><dt> <a href="#id2903822">a sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2890778">another sect1 title</a>
+<dt> <a href="#id2903953">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2890832">another sect2 title</a>
+<dd><dl><dt> <a href="#id2904007">another sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2891067">another sect1 title</a>
+<dt> <a href="#id2904242">another sect1 title</a>
</dt>
-<dt> <a href="#id2891100">another sect1 title</a>
+<dt> <a href="#id2904275">another sect1 title</a>
</dt>
</dl></dd>
<dt><a href="#bib1">A Test Bibliography</a></dt>
<dt><a href="#gloss">Example Glossary</a></dt>
<dt><a href="#index">Index</a></dt>
-<dt><a href="#id2893149">An Index with a Title</a></dt>
+<dt><a href="#id2906324">An Index with a Title</a></dt>
</dl>
</div>
-<div id="id2848749" class="preface">
+<div id="id2861927" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2848749"></a>Preface Title</h2></div></div>
+<a name="id2861927"></a>Preface Title</h2></div></div>
<p>Preface content.</p>
<p>This is the second para of the preface.</p>
<p>This is the third para of the preface.</p>
</div>
-<div class="part" id="id2874895">
+<div class="part" id="id2888072">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2874895"></a>Part One Title</h1></div>
+<a name="id2888072"></a>Part One Title</h1></div>
<div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div>
</div>
<div class="partintro">
<div><div><h1 class="title">
-<a name="id2848647"></a>PartIntro Title</h1></div></div>
-<p>Partintro content<sup>[<a name="id2848668" href="#ftn.id2848668">1</a>]</sup>.</p>
+<a name="id2861823"></a>PartIntro Title</h1></div></div>
+<p>Partintro content<sup>[<a name="id2861843" href="#ftn.id2861843">1</a>]</sup>.</p>
<div class="sect1">
-<a name="id2848684"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2848684"></a><span class="title">PartIntro Section</span>
-</h2></div></div>
+<a name="id2861861"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2861861"></a>PartIntro Section</h2></div></div>
<p>PartIntros can actually have section content as well.</p>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#chapter">XRef Tests</a>
+<dt>1 <a href="#chapter">XRef Tests</a>
</dt>
-<dt>2. <a href="#stchap">Section Tests</a>
+<dt>2 <a href="#stchap">Section Tests</a>
</dt>
<dd><dl>
<dt> <a href="#secttest1">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2753555">a sect2 title</a>
+<dd><dl><dt> <a href="#id2766041">a sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest2">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2752500">another sect2 title</a>
+<dd><dl><dt> <a href="#id2766555">another sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest3">another sect1 title</a>
</dt>
<dt> <a href="#secttest4">another sect1 title</a>
</dt>
</dl></dd>
-<dt>3. <a href="#id2760689">Inline Tests</a>
+<dt>3 <a href="#id2766781">Inline Tests</a>
</dt>
-<dt>4. <a href="#id2876238">Block Tests</a>
+<dt>4 <a href="#id2889414">Block Tests</a>
</dt>
-<dt>5. <a href="#id2877820">List Tests</a>
+<dt>5 <a href="#id2890995">List Tests</a>
</dt>
-<dt>6. <a href="#id2881398">Table Tests</a>
+<dt>6 <a href="#id2894573">Table Tests</a>
</dt>
-<dt>7. <a href="#id2887434">Index Term Tests</a>
+<dt>7 <a href="#id2900610">Index Term Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2887506">Index Term Sect 1</a>
+<dt> <a href="#id2900681">Index Term Sect 1</a>
</dt>
<dd><dl>
-<dt> <a href="#id2887808">Index Term Sect 2</a>
+<dt> <a href="#id2900983">Index Term Sect 2</a>
</dt>
-<dt> <a href="#id2887951">Index Term Sect 3</a>
+<dt> <a href="#id2901126">Index Term Sect 3</a>
</dt>
</dl></dd>
</dl></dd>
@@ -139,54 +194,54 @@ of the dedication.</p>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2848668" href="#id2848668">1</a>] </sup>This is a footnote in a partintro.</p></div>
+<sup>[<a name="ftn.id2861843" href="#id2861843">1</a>] </sup>This is a footnote in a partintro.</p></div>
</div>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. XRef Tests</h2></div></div>
-<h3>Xrefs</h3>
+<h4>Xrefs</h4>
<table class="simplelist" border="0" summary="Simple list">
-<tr><td><a href="#book"><i>Book Title</i></a></td></tr>
-<tr><td><a href="#part">Part II.</a></td></tr>
-<tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr>
-<tr><td><a href="#appendix">Appendix A.</a></td></tr>
-<tr><td><a href="#table">Table 4.0.</a></td></tr>
-<tr><td><a href="#figure">Figure 4.0.</a></td></tr>
-<tr><td><a href="#example">Example 4.0.</a></td></tr>
-<tr><td><a href="#equation">Equation 4.0.</a></td></tr>
-<tr><td><a href="#reference">Reference I.</a></td></tr>
-<tr><td><a href="#bib1">&#x201C;A Test Bibliography&#x201D;</a></td></tr>
-<tr><td><a href="#gloss">&#x201C;Example Glossary&#x201D;</a></td></tr>
-<tr><td><a href="#index">&#x201C;Index&#x201D;</a></td></tr>
+<tr><td><a href="#book" title="Book Title">Book Title</a></td></tr>
+<tr><td><a href="#part" title="Part II. Part Two Title">Part II. Part Two Title</a></td></tr>
+<tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr>
+<tr><td><a href="#appendix" title="Appendix A. A Very Short Appendix">Appendix A. A Very Short Appendix</a></td></tr>
+<tr><td><a href="#table" title="Table 4.0. A Table">Table 4.0. A Table</a></td></tr>
+<tr><td><a href="#figure" title="Figure 4.0. A Figure">Figure 4.0. A Figure</a></td></tr>
+<tr><td><a href="#example" title="Example 4.0. An Example">Example 4.0. An Example</a></td></tr>
+<tr><td><a href="#equation" title="Equation 4.0. An Equation"></a></td></tr>
+<tr><td><a href="#reference" title="Reference">Reference</a></td></tr>
+<tr><td><a href="#bib1" title="A Test Bibliography">A Test Bibliography</a></td></tr>
+<tr><td><a href="#gloss" title="Example Glossary">Example Glossary</a></td></tr>
+<tr><td><a href="#index" title="Index">Index</a></td></tr>
</table>
<p>This is the first reference to <i>XML</i>.
-This is the second reference to XML.
-These are references without linkend
-attributes: <i>XML</i>, XML.</p>
-<h3>Links</h3>
+This is the second reference to <a href="#xml"><i>XML</i></a>.
+These are references without <tt>linkend</tt>
+attributes: <i>XML</i>, <i>XML</i>.</p>
+<h4>Links</h4>
<p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
is available.</p>
-<p>There is <a href="#part">a second part</a> in this book.</p>
-<p>This is the <a href="#chapter"></a>
+<p>There is <a href="#part" title="Part II. Part Two Title">a second part</a> in this book.</p>
+<p>This is the <a href="#chapter" title="Chapter 1. XRef Tests"></a>
chapter.</p>
</div>
-<div id="stchap" class="chapter">
+<div class="chapter">
<div class="titlepage">
<div><h2 class="title">
<a name="stchap"></a>Chapter 2. Section Tests</h2></div>
-<div><h2 class="subtitle">Section Tests Subtitle</h2></div>
+<div><h3 class="subtitle"><i>Section Tests Subtitle</i></h3></div>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
<dt> <a href="#secttest1">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2753555">a sect2 title</a>
+<dd><dl><dt> <a href="#id2766041">a sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest2">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2752500">another sect2 title</a>
+<dd><dl><dt> <a href="#id2766555">another sect2 title</a>
</dt></dl></dd>
<dt> <a href="#secttest3">another sect1 title</a>
</dt>
@@ -200,18 +255,18 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752944"></a>
-<a class="indexterm" name="id2752960"></a>
+<a class="indexterm" name="id2770946"></a>
+<a class="indexterm" name="id2770962"></a>
-<a class="indexterm" name="id2752975"></a>
-<a class="indexterm" name="id2752999"></a>
+<a class="indexterm" name="id2770977"></a>
+<a class="indexterm" name="id2771001"></a>
-<a class="indexterm" name="id2753015"></a>
-<a class="indexterm" name="id2753046"></a>
+<a class="indexterm" name="id2771016"></a>
+<a class="indexterm" name="id2771048"></a>
-<a class="indexterm" name="id2753062"></a>
-<a class="indexterm" name="id2753085"></a>
-<a class="indexterm" name="id2753109"></a>
+<a class="indexterm" name="id2771064"></a>
+<a class="indexterm" name="id2771087"></a>
+<a class="indexterm" name="id2771111"></a>
</p>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -232,29 +287,28 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect1">
-<a name="secttest1"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest1"></a><span class="title">a sect1 title</span>
-</h2></div></div>
+<a name="secttest1"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest1"></a>a sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753216"></a>
-<a class="indexterm" name="id2753248"></a>
-<a class="indexterm" name="id2753271"></a>
+<a class="indexterm" name="id2771218"></a>
+<a class="indexterm" name="id2771250"></a>
+<a class="indexterm" name="id2771273"></a>
-<a class="indexterm" name="id2753287"></a>
-<a class="indexterm" name="id2753310"></a>
-<a class="indexterm" name="id2753342"></a>
+<a class="indexterm" name="id2771289"></a>
+<a class="indexterm" name="id2771312"></a>
+<a class="indexterm" name="id2771344"></a>
-<a class="indexterm" name="id2753358"></a>
-<a class="indexterm" name="id2753381"></a>
-<a class="indexterm" name="id2753405"></a>
-<a class="indexterm" name="id2753436"></a>
-<a class="indexterm" name="id2753467"></a>
-<a class="indexterm" name="id2753491"></a>
+<a class="indexterm" name="id2771359"></a>
+<a class="indexterm" name="id2771383"></a>
+<a class="indexterm" name="id2770778"></a>
+<a class="indexterm" name="id2765922"></a>
+<a class="indexterm" name="id2765953"></a>
+<a class="indexterm" name="id2765977"></a>
</p>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -275,9 +329,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2753555"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2753555"></a><span class="title">a sect2 title</span>
-</h3></div></div>
+<a name="id2766041"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2766041"></a>a sect2 title</h3></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -285,30 +338,28 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2753586"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2753586"></a><span class="title">a sect3 title</span>
-</h4></div></div>
+<a name="id2766071"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2766071"></a>a sect3 title</h4></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753615"></a>
-<a class="indexterm" name="id2753646"></a>
-<a class="indexterm" name="id2753677"></a>
+<a class="indexterm" name="id2766100"></a>
+<a class="indexterm" name="id2766132"></a>
+<a class="indexterm" name="id2766163"></a>
-<a class="indexterm" name="id2753693"></a>
-<a class="indexterm" name="id2753709"></a>
-<a class="indexterm" name="id2753732"></a>
-<a class="indexterm" name="id2753764"></a>
-<a class="indexterm" name="id2753795"></a>
-<a class="indexterm" name="id2753826"></a>
+<a class="indexterm" name="id2766179"></a>
+<a class="indexterm" name="id2766194"></a>
+<a class="indexterm" name="id2766218"></a>
+<a class="indexterm" name="id2766249"></a>
+<a class="indexterm" name="id2766281"></a>
+<a class="indexterm" name="id2766312"></a>
</p>
<div class="sect4">
-<a name="id2753841"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2753841"></a><span class="title">a sect4 title</span>
-</h5></div></div>
+<a name="id2766327"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2766327"></a>a sect4 title</h5></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -316,9 +367,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2753872"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2753872"></a><span class="title">a sect5 title</span>
-</h6></div></div>
+<a name="id2766358"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2766358"></a>a sect5 title</h6></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -332,9 +382,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
<div class="sect1">
<a name="secttest2"></a><div class="titlepage">
-<div><h2 class="title" style="clear: all">
-<a name="secttest2"></a><span class="title">another sect1 title</span>
-</h2></div>
+<div><h2 class="title" style="clear: both">
+<a name="id2766416"></a>another sect1 title</h2></div>
<div><h2 class="subtitle">a sect1 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -343,16 +392,15 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752407"></a>
-<a class="indexterm" name="id2752423"></a>
-<a class="indexterm" name="id2752454"></a>
-<a class="indexterm" name="id2752486"></a>
+<a class="indexterm" name="id2766462"></a>
+<a class="indexterm" name="id2766478"></a>
+<a class="indexterm" name="id2766509"></a>
+<a class="indexterm" name="id2766541"></a>
</p>
<div class="sect2">
-<a name="id2752500"></a><div class="titlepage">
+<a name="id2766555"></a><div class="titlepage">
<div><h3 class="title">
-<a name="id2752500"></a><span class="title">another sect2 title</span>
-</h3></div>
+<a name="id2766562"></a>another sect2 title</h3></div>
<div><h2 class="subtitle">a sect2 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -362,10 +410,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2761021"></a><div class="titlepage">
+<a name="id2766610"></a><div class="titlepage">
<div><h4 class="title">
-<a name="id2761021"></a><span class="title">another sect3 title</span>
-</h4></div>
+<a name="id2766616"></a>another sect3 title</h4></div>
<div><h2 class="subtitle">a sect3 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -375,10 +422,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2761075"></a><div class="titlepage">
+<a name="id2766664"></a><div class="titlepage">
<div><h5 class="title">
-<a name="id2761075"></a><span class="title">another sect4 title</span>
-</h5></div>
+<a name="id2766670"></a>another sect4 title</h5></div>
<div><h2 class="subtitle">a sect4 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -388,10 +434,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2761130"></a><div class="titlepage">
+<a name="id2766719"></a><div class="titlepage">
<div><h6 class="title">
-<a name="id2761130"></a><span class="title">another sect5 title</span>
-</h6></div>
+<a name="id2766725"></a>another sect5 title</h6></div>
<div><h2 class="subtitle">a sect5 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -406,9 +451,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="secttest3"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest3"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="secttest3"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest3"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -417,9 +461,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
<div class="sect1">
-<a name="secttest4"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="secttest4"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="secttest4"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="secttest4"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -428,21 +471,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
</div>
-<div id="id2760689" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2760689"></a>Chapter 3. Inline Tests</h2></div></div>
+<a name="id2766781"></a>Chapter 3. Inline Tests</h2></div></div>
<div class="simplesect">
-<a name="id2753952"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753952"></a><span class="title">Testing `Quotes' in a title</span>
-</h2></div></div>
+<a name="id2766880"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766880"></a>Testing &#x2018;Quotes&#x2019; in a title</h2></div></div>
<p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
-Sort of<sup>[<a name="id2760945" href="#ftn.id2760945">3</a>]</sup>.
+Sort of<sup>[<a name="id2888397" href="#ftn.id2888397">3</a>]</sup>.
Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>Abbrev</td>
<td>GUIIcon</td>
-<td>SGMLTag (Attribute)</td>
+<td>
+<tt>SGMLTag</tt> (Attribute)</td>
</tr>
<tr>
<td>Acronym</td>
@@ -542,7 +585,7 @@ Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
<tr>
<td><tt>Filename</tt></td>
<td><i><tt>Parameter</tt></i></td>
-<td>Trademark</td>
+<td>Trademark&#x2122;</td>
</tr>
<tr>
<td><i>Firstterm</i></td>
@@ -577,8 +620,8 @@ Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p>
</table>
<p>And here are a couple of index terms, as another test (of
index terms, not inlines).
-<a class="indexterm" name="id2876189"></a>
-<a class="indexterm" name="id2876212"></a>
+<a class="indexterm" name="id2889364"></a>
+<a class="indexterm" name="id2889388"></a>
</p>
</div>
<div class="footnotes">
@@ -586,38 +629,37 @@ index terms, not inlines).
<div class="footnote"><p>
<sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div>
<div class="footnote"><p>
-<sup>[<a name="ftn.id2760945" href="#id2760945">3</a>] </sup>Well, the marks are, anyway!</p></div>
+<sup>[<a name="ftn.id2888397" href="#id2888397">3</a>] </sup>Well, the marks are, anyway!</p></div>
</div>
</div>
-<div id="id2876238" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2876238"></a>Chapter 4. Block Tests</h2></div></div>
+<a name="id2889414"></a>Chapter 4. Block Tests</h2></div></div>
<div class="simplesect">
-<a name="id2876252"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2876252"></a><span class="title">Formal Objects</span>
-</h2></div></div>
-<h3>Example</h3>
+<a name="id2889428"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2889428"></a>Formal Objects</h2></div></div>
+<h5>Example</h5>
<div class="example">
<p>
<a name="example"></a><b>Example 4.0. An Example</b>
</p>
<p>This is an example of a trivial example.</p>
</div>
-<h3>Figure</h3>
+<h5>Figure</h5>
<div class="figure">
<p>
<a name="figure"></a><b>Figure 4.0. A Figure</b>
</p>
<pre class="screen">This is an example of a trivial figure.</pre>
</div>
-<h3>Equation</h3>
+<h5>Equation</h5>
<div class="equation">
<p>
<a name="equation"></a><b>Equation 4.0. An Equation</b>
</p>
<p><img src="emc2.gif"></p>
</div>
-<h3>Table</h3>
+<h5>Table</h5>
<div class="table">
<p>
<a name="table"></a><b>Table 4.0. A Table</b>
@@ -645,24 +687,18 @@ index terms, not inlines).
</div>
</div>
<div class="simplesect">
-<a name="id2876562"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2876562"></a><span class="title">Informal Objects</span>
-</h2></div></div>
-<h3>InformalExample</h3>
+<a name="id2889738"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2889738"></a>Informal Objects</h2></div></div>
+<h5>InformalExample</h5>
<div class="informalexample" id="iexample">
-<p>
<a name="iexample"></a><p>This is an example of a trivial, informal example.</p>
-<p>
</div>
-<h3>InformalEquation</h3>
+<h5>InformalEquation</h5>
<div class="informalequation" id="iequation">
-<p>
<a name="iequation"></a><p><img src="emc2.gif"></p>
-<p>
</div>
-<h3>InformalTable</h3>
+<h5>InformalTable</h5>
<div class="informaltable" id="itable">
-<p>
<a name="itable"></a><table border="1">
<colgroup>
<col>
@@ -683,64 +719,70 @@ index terms, not inlines).
</tr>
</tbody>
</table>
-<p>
</div>
</div>
<div class="simplesect">
-<a name="id2876786"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2876786"></a><span class="title">Admonitions</span>
-</h2></div></div>
-<h3>Note</h3>
+<a name="id2889961"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2889961"></a>Admonitions</h2></div></div>
+<h5>Note</h5>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876814">Note</a></h3>
+<h3 class="title">
+<a name="id2889990"></a>Note</h3>
<p>Consider yourself noted.</p>
<p>Second para.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876837">Note</a></h3>
+<h3 class="title">
+<a name="id2890013"></a>Note</h3>
<p>Consider yourself noted, simply.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876854">NoteTitle</a></h3>
+<h3 class="title">
+<a name="id2890029"></a>NoteTitle</h3>
<p>Consider yourself noted.</p>
<p>Second para, with a title.</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876886">Att</a></h3>
+<h3 class="title">
+<a name="id2890061"></a>Att</h3>
<p>Consider yourself noted, simply.</p>
<p>With a title</p>
</div>
-<h3>Important</h3>
+<h5>Important</h5>
<div class="important" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876932">Important</a></h3>
+<h3 class="title">
+<a name="id2890108"></a>Important</h3>
<p>Consider yourself important.</p>
</div>
-<h3>Tip</h3>
+<h5>Tip</h5>
<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876950">Tip</a></h3>
+<h3 class="title">
+<a name="id2890126"></a>Tip</h3>
<p>Consider yourself tipped.</p>
</div>
-<h3>Warning</h3>
+<h5>Warning</h5>
<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2876991">Warning</a></h3>
+<h3 class="title">
+<a name="id2890166"></a>Warning</h3>
<p>Consider yourself warned.</p>
</div>
-<h3>Caution</h3>
+<h5>Caution</h5>
<div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2877020">Caution</a></h3>
+<h3 class="title">
+<a name="id2890196"></a>Caution</h3>
<p>Consider yourself cautioned.</p>
</div>
-<h3>SimPara in Caution</h3>
+<h5>SimPara in Caution</h5>
<div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2877050">Simple Caution</a></h3>
+<h3 class="title">
+<a name="id2890226"></a>Simple Caution</h3>
<p>A simpler caution.</p>
</div>
</div>
<div class="simplesect">
-<a name="id2877075"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2877075"></a><span class="title">Other Objects</span>
-</h2></div></div>
-<h3>Screen</h3>
+<a name="id2890250"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2890250"></a>Other Objects</h2></div></div>
+<h5>Screen</h5>
<pre class="screen">This
is With a line-annotation
a
@@ -753,12 +795,12 @@ This
is With a line-annotation
a
screen</pre>
-<h3>ProgramListing</h3>
+<h5>ProgramListing</h5>
<pre class="programlisting">This
is
a
programlisting</pre>
-<h3>Address</h3>
+<h5>Address</h5>
<div class="address">Norman Walsh<br>
ArborText, Inc.<br>
1000 Victors Way<br>
@@ -770,48 +812,66 @@ Fax: 313.997.0201<br>
<br>
Email: <tt>&lt;<a href="mailto:nwalsh@arbortext.com">nwalsh@arbortext.com</a>&gt;</tt><br>
WWW: http://www.arbortext.com/</div>
-<h3>BlockQuote</h3>
+<h5>BlockQuote</h5>
<blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote>
-<h3>Procedure</h3>
-<div class="procedure"><ol>
-<li><p>This is the first step</p></li>
+<h5>Procedure</h5>
+<div class="procedure">
+<a name="id2890493"></a><ol>
<li>
-<p>This is the second step</p>
-<ol>
-<li><p>This is the first substep</p></li>
-<li><p>This is the second substep</p></li>
+<a name="id2890500"></a><p>This is the first step</p>
+</li>
+<li>
+<a name="id2890516"></a><p>This is the second step</p>
+<ol type="a">
+<li>
+<a name="id2890536"></a><p>This is the first substep</p>
+</li>
+<li>
+<a name="id2890552"></a><p>This is the second substep</p>
+</li>
</ol>
</li>
-<li><p>This is the third step</p></li>
-</ol></div>
-<h3>Procedure With Title</h3>
+<li>
+<a name="id2890474"></a><p>This is the third step</p>
+</li>
+</ol>
+</div>
+<h5>Procedure With Title</h5>
<div class="procedure">
-<p><b>Same Procedure with a Title</b></p>
+<a name="id2890598"></a><p><b>Same Procedure with a Title</b></p>
<ol>
-<li><p>This is the first step</p></li>
<li>
-<p>This is the second step</p>
-<ol>
-<li><p>This is the first substep</p></li>
-<li><p>This is the second substep</p></li>
+<a name="id2890611"></a><p>This is the first step</p>
+</li>
+<li>
+<a name="id2890627"></a><p>This is the second step</p>
+<ol type="a">
+<li>
+<a name="id2890647"></a><p>This is the first substep</p>
+</li>
+<li>
+<a name="id2890663"></a><p>This is the second substep</p>
+</li>
</ol>
</li>
-<li><p>This is the third step</p></li>
+<li>
+<a name="id2890683"></a><p>This is the third step</p>
+</li>
</ol>
</div>
-<h3>SideBar</h3>
+<h5>SideBar</h5>
<div class="sidebar">
-<a name="id2877540"></a><p class="title"><b>What About Bob?</b></p>
+<a name="id2890715"></a><p class="title"><b>What About Bob?</b></p>
<p>This is a sidebar.</p>
</div>
-<h3>MsgSet</h3>
+<h5>MsgSet</h5>
<p>It's not really clear how <tt>MsgSet</tt> should be presented.
I expect that it's fairly application, if not document, specific.</p>
<div class="msgentry">
-<a name="id2877600"></a><div class="msg">
-<a name="id2877606"></a><p>Record failed CRC</p>
+<a name="id2890775"></a><div class="msg">
+<a name="id2890781"></a><p>Record failed CRC</p>
<p>Record <i><tt>n</tt></i>
in <i><tt>database</tt></i>
</p>
@@ -821,7 +881,7 @@ I expect that it's fairly application, if not document, specific.</p>
<p>Panic! Corrupt record!</p>
</div>
<div class="msginfo">
-<a name="id2877729"></a><p>
+<a name="id2890904"></a><p>
<b>Level: </b>severe</p>
<p>
<b>Origin: </b>server</p>
@@ -829,13 +889,13 @@ I expect that it's fairly application, if not document, specific.</p>
<b>Audience: </b>all</p>
</div>
<div class="msgexplan">
-<a name="id2877760"></a><p> Indicates that some sort of error occured attempting to load
+<a name="id2890935"></a><p> Indicates that some sort of error occured attempting to load
a record from the database. Retry. If failure persists,
contact the database administrator.
</p>
</div>
</div>
-<h3>LiteralLayout</h3>
+<h5>LiteralLayout</h5>
<div class="literallayout">This is a<br>
literal<br>
       layout</div>
@@ -845,253 +905,250 @@ literal<br>
  in a para</div></p>
</div>
</div>
-<div id="id2877820" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2877820"></a>Chapter 5. List Tests</h2></div></div>
+<a name="id2890995"></a>Chapter 5. List Tests</h2></div></div>
<div class="simplesect">
-<a name="id2877834"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2877834"></a><span class="title">OrderedLists</span>
-</h2></div></div>
-<h3>Default Numeration</h3>
+<a name="id2891009"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2891009"></a>OrderedLists</h2></div></div>
+<h5>Default Numeration</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2877868"></a>One</p></li>
+<a name="id2891043"></a>One</p></li>
<li>
-<a name="id2877884"></a><pre class="programlisting">this one starts with
+<a name="id2891059"></a><pre class="programlisting">this one starts with
a program listing
what happens?</pre>
</li>
<li>
-<a name="id2877901"></a><pre class="synopsis">this one starts with
+<a name="id2891076"></a><pre class="synopsis">this one starts with
a synopsis
what happens?</pre>
</li>
<li>
<p>
-<a name="id2877917"></a>para first</p>
+<a name="id2891092"></a>para first</p>
<pre class="synopsis">this one has
a synopsis
what happens?</pre>
</li>
<li>
<p>
-<a name="id2877941"></a>Three</p>
+<a name="id2891116"></a>Three</p>
<pre class="screen">A
Screen
Here</pre>
</li>
<li><p>
-<a name="id2877965"></a>Four</p></li>
+<a name="id2891140"></a>Four</p></li>
</ol></div>
-<h3>Arabic Numeration</h3>
+<h5>Arabic Numeration</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2877998"></a>One</p></li>
+<a name="id2891173"></a>One</p></li>
<li><p>
-<a name="id2878024"></a>Two</p></li>
+<a name="id2891199"></a>Two</p></li>
<li><p>
-<a name="id2878038"></a>Three</p></li>
+<a name="id2891214"></a>Three</p></li>
<li><p>
-<a name="id2878054"></a>Four</p></li>
+<a name="id2891229"></a>Four</p></li>
</ol></div>
-<h3>Arabic Numeration (Long)</h3>
+<h5>Arabic Numeration (Long)</h5>
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2878087"></a>One</p></li>
+<a name="id2891262"></a>One</p></li>
<li><p>
-<a name="id2878113"></a>Two</p></li>
+<a name="id2891288"></a>Two</p></li>
<li><p>
-<a name="id2878129"></a>Three</p></li>
+<a name="id2891304"></a>Three</p></li>
<li><p>
-<a name="id2878144"></a>Four</p></li>
+<a name="id2891319"></a>Four</p></li>
<li><p>
-<a name="id2878160"></a>Five</p></li>
+<a name="id2891335"></a>Five</p></li>
<li><p>
-<a name="id2878176"></a>Six</p></li>
+<a name="id2891351"></a>Six</p></li>
<li><p>
-<a name="id2878191"></a>Seven</p></li>
+<a name="id2891366"></a>Seven</p></li>
<li><p>
-<a name="id2878207"></a>Eight</p></li>
+<a name="id2891382"></a>Eight</p></li>
<li><p>
-<a name="id2878223"></a>Nine</p></li>
+<a name="id2891398"></a>Nine</p></li>
<li><p>
-<a name="id2878238"></a>Ten</p></li>
+<a name="id2891414"></a>Ten</p></li>
<li><p>
-<a name="id2878254"></a>Eleven</p></li>
+<a name="id2891429"></a>Eleven</p></li>
</ol></div>
-<h3>UpperAlpha Numeration</h3>
+<h5>UpperAlpha Numeration</h5>
<div class="orderedlist"><ol type="A">
<li><p>
-<a name="id2878287"></a>One</p></li>
+<a name="id2891462"></a>One</p></li>
<li><p>
-<a name="id2878313"></a>Two</p></li>
+<a name="id2891488"></a>Two</p></li>
<li><p>
-<a name="id2878329"></a>Three</p></li>
+<a name="id2891504"></a>Three</p></li>
<li><p>
-<a name="id2878344"></a>Four</p></li>
+<a name="id2891519"></a>Four</p></li>
</ol></div>
-<h3>LowerAlpha Numeration</h3>
+<h5>LowerAlpha Numeration</h5>
<div class="orderedlist"><ol type="a">
<li><p>
-<a name="id2878377"></a>One</p></li>
+<a name="id2891552"></a>One</p></li>
<li><p>
-<a name="id2878403"></a>Two</p></li>
+<a name="id2891578"></a>Two</p></li>
<li><p>
-<a name="id2878419"></a>Three</p></li>
+<a name="id2891594"></a>Three</p></li>
<li><p>
-<a name="id2878434"></a>Four</p></li>
+<a name="id2891610"></a>Four</p></li>
</ol></div>
-<h3>UpperRoman Numeration</h3>
+<h5>UpperRoman Numeration</h5>
<div class="orderedlist"><ol type="I">
<li><p>
-<a name="id2878467"></a>One</p></li>
+<a name="id2891642"></a>One</p></li>
<li><p>
-<a name="id2878493"></a>Two</p></li>
+<a name="id2891668"></a>Two</p></li>
<li><p>
-<a name="id2878509"></a>Three</p></li>
+<a name="id2891684"></a>Three</p></li>
<li><p>
-<a name="id2878525"></a>Four</p></li>
+<a name="id2891700"></a>Four</p></li>
</ol></div>
-<h3>LowerRoman Numeration</h3>
+<h5>LowerRoman Numeration</h5>
<div class="orderedlist"><ol type="i">
<li><p>
-<a name="id2878558"></a>One</p></li>
+<a name="id2891733"></a>One</p></li>
<li><p>
-<a name="id2878583"></a>Two</p></li>
+<a name="id2891758"></a>Two</p></li>
<li><p>
-<a name="id2878599"></a>Three</p></li>
+<a name="id2891774"></a>Three</p></li>
<li><p>
-<a name="id2878615"></a>Four</p></li>
+<a name="id2891790"></a>Four</p></li>
</ol></div>
-<h3>Continued</h3>
+<h5>Continued</h5>
<p>First list:
<div class="orderedlist"><ol type="1">
<li><p>
-<a name="id2878658"></a>One</p></li>
+<a name="id2891833"></a>One</p></li>
<li><p>
-<a name="id2878674"></a>Two</p></li>
+<a name="id2891849"></a>Two</p></li>
<li><p>
-<a name="id2878690"></a>Three</p></li>
+<a name="id2891865"></a>Three</p></li>
<li><p>
-<a name="id2878705"></a>Four</p></li>
+<a name="id2891880"></a>Four</p></li>
</ol></div>
</p>
<p>Second list:
<div class="orderedlist"><ol start="5" type="1">
<li><p>
-<a name="id2878730"></a>Five</p></li>
+<a name="id2891905"></a>Five</p></li>
<li><p>
-<a name="id2878755"></a>Six</p></li>
+<a name="id2891930"></a>Six</p></li>
<li><p>
-<a name="id2878771"></a>Seven</p></li>
+<a name="id2891946"></a>Seven</p></li>
<li><p>
-<a name="id2878787"></a>Eight</p></li>
+<a name="id2891962"></a>Eight</p></li>
<li><p>
-<a name="id2878802"></a>Nine</p></li>
+<a name="id2891978"></a>Nine</p></li>
<li><p>
-<a name="id2878818"></a>Ten</p></li>
+<a name="id2891993"></a>Ten</p></li>
</ol></div>
</p>
</div>
<div class="simplesect">
-<a name="id2878836"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2878836"></a><span class="title">ItemizedLists</span>
-</h2></div></div>
-<h3>Default Presentation</h3>
+<a name="id2892011"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2892011"></a>ItemizedLists</h2></div></div>
+<h5>Default Presentation</h5>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2878870"></a>One</p></li>
+<a name="id2892046"></a>One</p></li>
<li>
-<a name="id2878886"></a><pre class="programlisting">One-point-five. This one starts with
+<a name="id2892061"></a><pre class="programlisting">One-point-five. This one starts with
a program listing
what happens?</pre>
</li>
<li><p>
-<a name="id2878904"></a>Two</p></li>
+<a name="id2892079"></a>Two</p></li>
<li><p>
-<a name="id2878919"></a>Three</p></li>
+<a name="id2892094"></a>Three</p></li>
<li><p>
-<a name="id2878935"></a>Four</p></li>
+<a name="id2892110"></a>Four</p></li>
</ul></div>
-<h3>Block Elements in a List</h3>
+<h5>Block Elements in a List</h5>
<div class="itemizedlist"><ul>
<li>
<p>
-<a name="id2878972"></a>One</p>
+<a name="id2892147"></a>One</p>
<p>Another para.</p>
</li>
<li><p>
-<a name="id2878996"></a>Two</p></li>
+<a name="id2892171"></a>Two</p></li>
<li><p>
-<a name="id2879012"></a>Three</p></li>
+<a name="id2892187"></a>Three</p></li>
<li><p>
-<a name="id2879027"></a>Four</p></li>
+<a name="id2892202"></a>Four</p></li>
</ul></div>
-<h3>Alternate Mark and OverRide</h3>
+<h5>Alternate Mark and OverRide</h5>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2879061"></a>TeX and LaTeX</p></li>
+<a name="id2892236"></a>TeX and LaTeX</p></li>
<li style="list-style-type: disc"><p>
-<a name="id2879091"></a>Troff</p></li>
+<a name="id2892266"></a>Troff</p></li>
<li><p>
-<a name="id2879107"></a>Lout</p></li>
+<a name="id2892282"></a>Lout</p></li>
<li style="list-style-type: none"><p>
-<a name="id2879128"></a>Test</p></li>
+<a name="id2892303"></a>Test</p></li>
</ul></div>
-<h3>No mark Presentation</h3>
+<h5>No mark Presentation</h5>
<div class="itemizedlist"><ul>
<li style="list-style-type: none"><p>
-<a name="id2879176"></a>One</p></li>
+<a name="id2892351"></a>One</p></li>
<li style="list-style-type: disc"><p>
-<a name="id2879196"></a>Two</p></li>
+<a name="id2892371"></a>Two</p></li>
<li><p>
-<a name="id2879211"></a>Three</p></li>
+<a name="id2892386"></a>Three</p></li>
<li><p>
-<a name="id2879227"></a>Four</p></li>
+<a name="id2892402"></a>Four</p></li>
</ul></div>
</div>
<div class="simplesect">
-<a name="id2879246"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2879246"></a><span class="title">VariableLists</span>
-</h2></div></div>
+<a name="id2892421"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2892421"></a>VariableLists</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2879267"></a><span class="term">Term1</span>
+<a name="id2892442"></a><span class="term">Term1</span>
</dt>
<dd><p>
-<a name="id2879281"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2892456"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2879305"></a><span class="term">Term2</span>
+<a name="id2892480"></a><span class="term">Term2</span>
</dt>
<dd><p>
-<a name="id2879319"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2892494"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2879342"></a><span class="term">Term3</span>
+<a name="id2892518"></a><span class="term">Term3</span>
</dt>
<dd>
<p>
-<a name="id2879357"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2892532"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2879383"></a>One</p></li>
+<a name="id2892558"></a>One</p></li>
<li><p>
-<a name="id2879399"></a>Two</p></li>
+<a name="id2892574"></a>Two</p></li>
<li><p>
-<a name="id2879414"></a>Three</p></li>
+<a name="id2892590"></a>Three</p></li>
<li><p>
-<a name="id2879430"></a>Four</p></li>
+<a name="id2892605"></a>Four</p></li>
</ul></div>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -1100,10 +1157,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</dd>
<dt>
-<a name="id2879465"></a><span class="term">Term4</span>
+<a name="id2892640"></a><span class="term">Term4</span>
</dt>
<dd><p>
-<a name="id2879479"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2892654"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -1111,16 +1168,16 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
</dl></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2879511"></a><span class="term">Another List</span>
+<a name="id2892686"></a><span class="term">Another List</span>
</dt>
<dd><p>
-<a name="id2879525"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+<a name="id2892700"></a>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd>
<dt>
-<a name="id2879549"></a><span class="term">ProgramListing</span>
+<a name="id2892724"></a><span class="term">ProgramListing</span>
</dt>
<dd>
<pre class="programlisting">A ProgramListing
@@ -1135,14 +1192,13 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</dl></div>
</div>
<div class="simplesect">
-<a name="id2879599"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2879599"></a><span class="title">SimpleLists</span>
-</h2></div></div>
-<h3>Inline</h3>
+<a name="id2892774"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2892774"></a>SimpleLists</h2></div></div>
+<h5>Inline</h5>
<p>An inline simple list:
<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span>
</p>
-<h3>Horiz</h3>
+<h5>Horiz</h5>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>One</td>
@@ -1160,7 +1216,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<td>&nbsp;</td>
</tr>
</table>
-<h3>Vert</h3>
+<h5>Vert</h5>
<table class="simplelist" border="0" summary="Simple list">
<tr>
<td>One</td>
@@ -1180,70 +1236,68 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</table>
</div>
<div class="simplesect">
-<a name="id2879873"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2879873"></a><span class="title">More Complex List Item Content</span>
-</h2></div></div>
+<a name="id2893048"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2893048"></a>More Complex List Item Content</h2></div></div>
<div class="itemizedlist"><ul>
<li>
<p>
-<a name="id2879894"></a>One</p>
+<a name="id2893069"></a>One</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2879918"></a>Two</p>
+<a name="id2893093"></a>Two</p>
<p>Second para</p>
</li>
<li>
-<a name="id2879941"></a><p>Three</p>
+<a name="id2893116"></a><p>Three</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2879965"></a>Four</p>
+<a name="id2893140"></a>Four</p>
<p>Second para</p>
</li>
<li>
-<a name="id2879988"></a><p>
+<a name="id2893164"></a><p>
<b>Formal Element</b> Five</p>
<p>Second para</p>
</li>
<li><p>
-<a name="id2880028"></a>Six</p></li>
+<a name="id2893203"></a>Six</p></li>
</ul></div>
<div class="orderedlist"><ol type="1">
<li>
<p>
-<a name="id2880051"></a>One</p>
+<a name="id2893226"></a>One</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2880075"></a>Two</p>
+<a name="id2893250"></a>Two</p>
<p>Second para</p>
</li>
<li>
-<a name="id2880098"></a><p>Three</p>
+<a name="id2893274"></a><p>Three</p>
<p>Second para</p>
</li>
<li>
<p>
-<a name="id2880122"></a>Four</p>
+<a name="id2893297"></a>Four</p>
<p>Second para</p>
</li>
<li>
-<a name="id2880146"></a><p>
+<a name="id2893321"></a><p>
<b>Formal Element</b> Five</p>
<p>Second para</p>
</li>
<li><p>
-<a name="id2880185"></a>Six</p></li>
+<a name="id2893360"></a>Six</p></li>
</ol></div>
</div>
<div class="simplesect">
-<a name="id2880204"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2880204"></a><span class="title">Segmented List</span>
-</h2></div></div>
+<a name="id2893379"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2893379"></a>Segmented List</h2></div></div>
<p><b>State Birds</b></p>
<p>
<b>State: </b>Alabama</p>
@@ -1447,13 +1501,12 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<b>Bird: </b>Western Meadowlark</p>
</div>
</div>
-<div id="id2881398" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2881398"></a>Chapter 6. Table Tests</h2></div></div>
-<h3>Alternate Alignment on Entry</h3>
-<div class="informaltable" id="id2881432">
-<p>
-<a name="id2881432"></a><table border="1">
+<a name="id2894573"></a>Chapter 6. Table Tests</h2></div></div>
+<h5>Alternate Alignment on Entry</h5>
+<div class="informaltable" id="id2894607">
+<a name="id2894607"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1477,11 +1530,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<div class="informaltable" id="id2881654">
-<p>
-<a name="id2881654"></a><table border="1">
+<div class="informaltable" id="id2894829">
+<a name="id2894829"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1505,11 +1556,9 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<div class="informaltable" id="id2881871">
-<p>
-<a name="id2881871"></a><table border="1">
+<div class="informaltable" id="id2895046">
+<a name="id2895046"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1533,12 +1582,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Absolute Widths</h3>
-<div class="informaltable" id="id2882122">
-<p>
-<a name="id2882122"></a><table border="1">
+<h5>Absolute Widths</h5>
+<div class="informaltable" id="id2895297">
+<a name="id2895297"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1567,12 +1614,10 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Relative Widths</h3>
-<div class="informaltable" id="id2882360">
-<p>
-<a name="id2882360"></a><table border="1">
+<h5>Relative Widths</h5>
+<div class="informaltable" id="id2895535">
+<a name="id2895535"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1588,14 +1633,12 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Too many cells</h3>
+<h5>Too many cells</h5>
<p>This is a broken table. There are too many cells in the second row.
YMMV. Don't do this.</p>
-<div class="informaltable" id="id2882529">
-<p>
-<a name="id2882529"></a><table border="1">
+<div class="informaltable" id="id2895704">
+<a name="id2895704"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1616,9 +1659,8 @@ YMMV. Don't do this.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>Missing Entrys</h3>
+<h5>Missing Entrys</h5>
<div class="table">
<p>
<a name="t1"></a><b>Table 6.0. Table Title</b>
@@ -1642,21 +1684,18 @@ YMMV. Don't do this.</p>
</tr>
<tr>
<td><p>b1</p></td>
-<td> </td>
<td><p>b3</p></td>
</tr>
<tr>
-<td> </td>
<td colspan="0"><p>c2</p></td>
<td><p>c3</p></td>
</tr>
</tbody>
</table>
</div>
-<h3>Complex</h3>
-<div class="informaltable" id="id2882914">
-<p>
-<a name="id2882914"></a><table width="100%" border="1">
+<h5>Complex</h5>
+<div class="informaltable" id="id2896089">
+<a name="id2896089"></a><table width="100%" border="1">
<colgroup>
<col>
<col align="right">
@@ -1689,7 +1728,6 @@ YMMV. Don't do this.</p>
<td rowspan="3" colspan="2" valign="middle">C5</td>
</tr>
<tr>
-<td> </td>
<td colspan="0">D2</td>
<td>D3</td>
<td>D4</td>
@@ -1709,12 +1747,10 @@ YMMV. Don't do this.</p>
</tr>
</tbody>
</table>
-<p>
</div>
-<h3>With Footnotes</h3>
-<div class="informaltable" id="id2883358">
-<p>
-<a name="id2883358"></a><table border="1">
+<h5>With Footnotes</h5>
+<div class="informaltable" id="id2896533">
+<a name="id2896533"></a><table border="1">
<colgroup>
<col>
<col>
@@ -1742,12 +1778,10 @@ word</p></div>
number</p></div>
</td></tr>
</table>
-<p>
</div>
-<h3>A Big One</h3>
-<div class="informaltable" id="id2883520">
-<p>
-<a name="id2883520"></a><table border="1">
+<h5>A Big One</h5>
+<div class="informaltable" id="id2896695">
+<a name="id2896695"></a><table border="1">
<colgroup>
<col>
<col>
@@ -2295,42 +2329,38 @@ number</p></div>
</tr>
</tbody>
</table>
-<p>
</div>
</div>
-<div id="id2887434" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2887434"></a>Chapter 7. Index Term Tests</h2></div></div>
+<a name="id2900610"></a>Chapter 7. Index Term Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2887506">Index Term Sect 1</a>
+<dt> <a href="#id2900681">Index Term Sect 1</a>
</dt>
<dd><dl>
-<dt> <a href="#id2887808">Index Term Sect 2</a>
+<dt> <a href="#id2900983">Index Term Sect 2</a>
</dt>
-<dt> <a href="#id2887951">Index Term Sect 3</a>
+<dt> <a href="#id2901126">Index Term Sect 3</a>
</dt>
</dl></dd>
</dl>
</div>
<p>Test data.</p>
<a class="indexterm" name="idx1"></a><a class="indexterm" name="idx2"></a><div class="sect1">
-<a name="id2887506"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2887506"></a><span class="title">Index Term Sect 1</span>
-</h2></div></div>
+<a name="id2900681"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2900681"></a>Index Term Sect 1</h2></div></div>
<p>Test data.</p>
-<a class="indexterm" name="idx3"></a><a class="indexterm" name="fred"></a><a class="indexterm" name="idx5"></a><a class="indexterm" name="idx6"></a><a class="indexterm" name="idx7"></a><a class="indexterm" name="idx8"></a><a class="indexterm" name="idx9"></a><a class="indexterm" name="id2887751"></a><a class="indexterm" name="idx11"></a><div class="sect2">
-<a name="id2887808"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2887808"></a><span class="title">Index Term Sect 2</span>
-</h3></div></div>
+<a class="indexterm" name="idx3"></a><a class="indexterm" name="fred"></a><a class="indexterm" name="idx5"></a><a class="indexterm" name="idx6"></a><a class="indexterm" name="idx7"></a><a class="indexterm" name="idx8"></a><a class="indexterm" name="idx9"></a><a class="indexterm" name="id2900926"></a><a class="indexterm" name="idx11"></a><div class="sect2">
+<a name="id2900983"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2900983"></a>Index Term Sect 2</h3></div></div>
<p>Test data.</p>
<a class="indexterm" name="idx12"></a><a class="indexterm" name="idx13"></a><a class="indexterm" name="idx14"></a><a class="indexterm" name="idx15"></a>
</div>
<div class="sect2">
-<a name="id2887951"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2887951"></a><span class="title">Index Term Sect 3</span>
-</h3></div></div>
+<a name="id2901126"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2901126"></a>Index Term Sect 3</h3></div></div>
<p>foo</p>
</div>
</div>
@@ -2342,69 +2372,61 @@ number</p></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>8. <a href="#id2888003">CmdSynopsis Tests</a>
+<dt>8 <a href="#id2901178">CmdSynopsis Tests</a>
</dt>
-<dt>9. <a href="#id2888760">FuncSynopsis Tests</a>
+<dt>9 <a href="#id2901935">FuncSynopsis Tests</a>
</dt>
-<dt>10. <a href="#id2889059">Callout Tests</a>
+<dt>10 <a href="#id2902234">Callout Tests</a>
</dt>
</dl>
</div>
-<div id="id2888003" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2888003"></a>Chapter 8. CmdSynopsis Tests</h2></div></div>
-<h3>Very Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2888032">
-<a name="id2888032"></a><tt>cd</tt> {<i><tt>directory</tt></i>}</div>
-<h3>Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2888077">
-<a name="id2888077"></a><tt>cal</tt> [-j] [-y] [month [year]]</div>
-<h3>Another Simple CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2888134">
-<a name="id2888134"></a><tt>chgrp</tt> [-R
+<a name="id2901178"></a>Chapter 8. CmdSynopsis Tests</h2></div></div>
+<h5>Very Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2901207">
+<a name="id2901207"></a><tt>cd</tt> {<i><tt>directory</tt></i>}</div>
+<h5>Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2901252">
+<a name="id2901252"></a><tt>cal</tt> [-j] [-y] [month [year]]</div>
+<h5>Another Simple CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2901310">
+<a name="id2901310"></a><tt>chgrp</tt> [-R
[-H | -L | -P]
] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div>
-<h3>Slightly Complex CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2888246">
-<a name="id2888246"></a><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div>
-<h3>Quite Complex CmdSynopsis</h3>
-<div class="cmdsynopsis" id="id2888377">
-<a name="id2888377"></a><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div>
-</div>
-<div id="id2888760" class="chapter">
+<h5>Slightly Complex CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2901421">
+<a name="id2901421"></a><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div>
+<h5>Quite Complex CmdSynopsis</h5>
+<div class="cmdsynopsis" id="id2901552">
+<a name="id2901552"></a><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2888760"></a>Chapter 9. FuncSynopsis Tests</h2></div></div>
-<h3>Two Simple Parameters</h3>
-<div class="funcsynopsis" id="id2888789">
-<p>
-<a name="id2888789"></a><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br>int <var class="pdparam">int1</var>;<br>int <var class="pdparam">int2</var>;</code></p>
-<p>
-</div>
-<h3>Variable Arguments</h3>
-<div class="funcsynopsis" id="id2888858">
-<p>
-<a name="id2888858"></a><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre>
+<a name="id2901935"></a>Chapter 9. FuncSynopsis Tests</h2></div></div>
+<h5>Two Simple Parameters</h5>
+<div class="funcsynopsis" id="id2901964">
+<a name="id2901964"></a><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br>int <var class="pdparam">int1</var>;<br>int <var class="pdparam">int2</var>;</code></p>
+</div>
+<h5>Variable Arguments</h5>
+<div class="funcsynopsis" id="id2902033">
+<a name="id2902033"></a><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre>
<p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p>
-<p>
</div>
-<h3>Void</h3>
-<div class="funcsynopsis" id="id2888925">
-<p>
-<a name="id2888925"></a><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p>
-<p>
+<h5>Void</h5>
+<div class="funcsynopsis" id="id2902100">
+<a name="id2902100"></a><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p>
</div>
-<h3>Function Pointer Arguments</h3>
-<div class="funcsynopsis" id="id2888962">
-<p>
-<a name="id2888962"></a><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br>void *<var class="pdparam">dataptr</var>[];<br>int <var class="pdparam">left</var>;<br>int <var class="pdparam">right</var>;<br>int <var class="pdparam">(* comp)</var>
+<h5>Function Pointer Arguments</h5>
+<div class="funcsynopsis" id="id2902137">
+<a name="id2902137"></a><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br>void *<var class="pdparam">dataptr</var>[];<br>int <var class="pdparam">left</var>;<br>int <var class="pdparam">right</var>;<br>int <var class="pdparam">(* comp)</var>
(void *, void *);</code></p>
-<p>
</div>
</div>
-<div id="id2889059" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2889059"></a>Chapter 10. Callout Tests</h2></div></div>
-<h3>CallOut (using AREASPEC)</h3>
+<a name="id2902234"></a>Chapter 10. Callout Tests</h2></div></div>
+<h5>CallOut (using AREASPEC)</h5>
<div class="programlistingco">
<pre class="programlisting">@rem = '--*-Perl-*--
@echo off
@@ -2437,44 +2459,57 @@ while (@DIRS) {
}
exit;</pre>
-<div class="calloutlist"><table border="0" summary="Callout list">
+<div class="calloutlist">
+<a name="id2902421"></a><table border="0" summary="Callout list">
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/1.png" alt="1" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2902430"></a><img src="../images/callouts/1.png" alt="1" border="0">
+</td>
<td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/2.png" alt="2" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2902475"></a><img src="../images/callouts/2.png" alt="2" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
file interpreter, skips over the body of the Perl script.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/3.png" alt="3" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2902517"></a><img src="../images/callouts/3.png" alt="3" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
fragments.</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/4.png" alt="4" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2902545"></a><img src="../images/callouts/4.png" alt="4" border="0">
+</td>
<td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
both a line and a column.)</p></td>
</tr>
<tr>
-<td width="5%" valign="top" align="left"><img src="../images/callouts/5.png" alt="5" border="0"></td>
+<td width="5%" valign="top" align="left">
+<a name="id2902583"></a><img src="../images/callouts/5.png" alt="5" border="0">
+</td>
<td valign="top" align="left"><p>This is a user subroutine call.</p></td>
</tr>
-</table></div>
+</table>
</div>
-<h3>CallOut (using CO)</h3>
+</div>
+<h5>CallOut (using CO)</h5>
<pre class="programlisting">this is a line
this is another line
there's a <a name="callout1"></a><img src="../images/callouts/1.png" alt="1" border="0">callout in here.
and there's another on the
next line
right here:<a name="callout2"></a><img src="../images/callouts/2.png" alt="2" border="0"></pre>
-<div class="calloutlist"><table border="0" summary="Callout list">
+<div class="calloutlist">
+<a name="id2902648"></a><table border="0" summary="Callout list">
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
+<a name="id2902669"></a><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
<td valign="top" align="left">
<p>First callout.</p>
<p>Second para in first callout.</p>
@@ -2482,7 +2517,7 @@ right here:<a name="callout2"></a><img src="../images/callouts/2.png" alt="2" bo
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2902704"></a><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
<td valign="top" align="left">
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -2495,19 +2530,26 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2902754"></a><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
<td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td>
</tr>
-</table></div>
+</table>
+</div>
</div>
</div>
-<div class="part" id="id2889615">
+<div class="part" id="id2902790">
<div class="titlepage"><div><h1 class="title">
-<a name="id2889615"></a>A Reference Part</h1></div></div>
+<a name="id2902790"></a>A Reference Part</h1></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt>I. <a href="#reference">Reference</a>
-</dt></dl>
+<dl>
+<dt>I <a href="#reference">Reference</a>
+</dt>
+<dd><dl>
+<dt><a href="#id2902827">RefEntryTitle</a></dt>
+<dt><a href="#id2903012"><tt>Chop</tt></a></dt>
+</dl></dd>
+</dl>
</div>
<div class="reference">
<a name="reference"></a><div class="titlepage">
@@ -2518,44 +2560,44 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt><a href="#id2889652">RefEntryTitle</a></dt>
-<dt><a href="#id2889837"><tt>Chop</tt></a></dt>
+<dt><a href="#id2902827">RefEntryTitle</a></dt>
+<dt><a href="#id2903012"><tt>Chop</tt></a></dt>
</dl>
</div>
<div class="refentry">
<h1 class="title">
-<a name="id2889652"></a>RefEntryTitle</h1>
+<a name="id2902827"></a>RefEntryTitle</h1>
<div class="refnamediv">
-<a name="id2889675"></a><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div>
+<a name="id2902850"></a><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div>
<div class="refsynopsisdiv">
-<a name="id2889715"></a><h2>Synopsis</h2>
+<a name="id2902890"></a><h2>Synopsis</h2>
<pre class="synopsis"> A
Synopsis
Goes
Here</pre>
</div>
<div class="refsect1">
-<a name="id2889731"></a><h2>
-<a name="id2889731"></a>A RefSect1</h2>
+<a name="id2902906"></a><h2>
+<a name="id2902906"></a>A RefSect1</h2>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="refsect2">
-<a name="id2889759"></a><h3>
-<a name="id2889759"></a>A RefSect2</h3>
+<a name="id2902934"></a><h3>
+<a name="id2902934"></a>A RefSect2</h3>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="refsect3">
-<a name="id2889787"></a><h4>
-<a name="id2889787"></a>A RefSect3</h4>
+<a name="id2902962"></a><h4>
+<a name="id2902962"></a>A RefSect3</h4>
<p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.<sup>[<a name="id2889810" href="#ftn.id2889810">6</a>]</sup>
+Blah blah blah blah.<sup>[<a name="id2902985" href="#ftn.id2902985">6</a>]</sup>
Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
@@ -2565,23 +2607,23 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2889810" href="#id2889810">6</a>] </sup>This is a footnote in a refentry.</p></div>
+<sup>[<a name="ftn.id2902985" href="#id2902985">6</a>] </sup>This is a footnote in a refentry.</p></div>
</div>
</div>
<div class="refentry">
<h1 class="title">
-<a name="id2889837"></a><tt>Chop</tt>
+<a name="id2903012"></a><tt>Chop</tt>
</h1>
<div class="refnamediv">
-<a name="id2889843"></a><h2>Name</h2>
+<a name="id2903018"></a><h2>Name</h2>
<tt>Chop</tt> &#x2014; strip trailing whitespace</div>
<div class="refsect1">
-<a name="id2889870"></a><h2>
-<a name="id2889870"></a>Description</h2>
+<a name="id2903045"></a><h2>
+<a name="id2903045"></a>Description</h2>
<p> Returns the argument string without trailing whitespace.
<div class="example">
<p>
-<a name="id2889891"></a><b>Example 2. chop() example</b>
+<a name="id2903066"></a><b>Example 2. chop() example</b>
</p>
<pre class="programlisting">$trimmed = Chop($line);</pre>
</div>
@@ -2590,28 +2632,28 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
</div>
</div>
</div>
-<div id="appendix" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
<a name="appendix"></a>Appendix A. A Very Short Appendix</h2></div></div>
<p>Blah.</p>
</div>
-<div id="id2889957" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2889957"></a>Appendix B. A Very Long Appendix</h2></div></div>
+<a name="id2903132"></a>Appendix B. A Very Long Appendix</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2890607">a sect1 title</a>
+<dt> <a href="#id2903782">a sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2890647">a sect2 title</a>
+<dd><dl><dt> <a href="#id2903822">a sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2890778">another sect1 title</a>
+<dt> <a href="#id2903953">another sect1 title</a>
</dt>
-<dd><dl><dt> <a href="#id2890832">another sect2 title</a>
+<dd><dl><dt> <a href="#id2904007">another sect2 title</a>
</dt></dl></dd>
-<dt> <a href="#id2891067">another sect1 title</a>
+<dt> <a href="#id2904242">another sect1 title</a>
</dt>
-<dt> <a href="#id2891100">another sect1 title</a>
+<dt> <a href="#id2904275">another sect1 title</a>
</dt>
</dl>
</div>
@@ -2846,9 +2888,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p>
<div class="sect1">
-<a name="id2890607"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2890607"></a><span class="title">a sect1 title</span>
-</h2></div></div>
+<a name="id2903782"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2903782"></a>a sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2856,9 +2897,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2890647"></a><div class="titlepage"><div><h3 class="title">
-<a name="id2890647"></a><span class="title">a sect2 title</span>
-</h3></div></div>
+<a name="id2903822"></a><div class="titlepage"><div><h3 class="title">
+<a name="id2903822"></a>a sect2 title</h3></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2866,9 +2906,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2890677"></a><div class="titlepage"><div><h4 class="title">
-<a name="id2890677"></a><span class="title">a sect3 title</span>
-</h4></div></div>
+<a name="id2903852"></a><div class="titlepage"><div><h4 class="title">
+<a name="id2903852"></a>a sect3 title</h4></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2876,9 +2915,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2890708"></a><div class="titlepage"><div><h5 class="title">
-<a name="id2890708"></a><span class="title">a sect4 title</span>
-</h5></div></div>
+<a name="id2903883"></a><div class="titlepage"><div><h5 class="title">
+<a name="id2903883"></a>a sect4 title</h5></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2886,9 +2924,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2890739"></a><div class="titlepage"><div><h6 class="title">
-<a name="id2890739"></a><span class="title">a sect5 title</span>
-</h6></div></div>
+<a name="id2903914"></a><div class="titlepage"><div><h6 class="title">
+<a name="id2903914"></a>a sect5 title</h6></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2901,10 +2938,9 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="id2890778"></a><div class="titlepage">
-<div><h2 class="title" style="clear: all">
-<a name="id2890778"></a><span class="title">another sect1 title</span>
-</h2></div>
+<a name="id2903953"></a><div class="titlepage">
+<div><h2 class="title" style="clear: both">
+<a name="id2903959"></a>another sect1 title</h2></div>
<div><h2 class="subtitle">a sect1 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2914,10 +2950,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect2">
-<a name="id2890832"></a><div class="titlepage">
+<a name="id2904007"></a><div class="titlepage">
<div><h3 class="title">
-<a name="id2890832"></a><span class="title">another sect2 title</span>
-</h3></div>
+<a name="id2904013"></a>another sect2 title</h3></div>
<div><h2 class="subtitle">a sect2 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2927,10 +2962,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect3">
-<a name="id2890887"></a><div class="titlepage">
+<a name="id2904062"></a><div class="titlepage">
<div><h4 class="title">
-<a name="id2890887"></a><span class="title">another sect3 title</span>
-</h4></div>
+<a name="id2904068"></a>another sect3 title</h4></div>
<div><h2 class="subtitle">a sect3 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2940,10 +2974,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect4">
-<a name="id2890950"></a><div class="titlepage">
+<a name="id2904125"></a><div class="titlepage">
<div><h5 class="title">
-<a name="id2890950"></a><span class="title">another sect4 title</span>
-</h5></div>
+<a name="id2904131"></a>another sect4 title</h5></div>
<div><h2 class="subtitle">a sect4 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2953,10 +2986,9 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
<div class="sect5">
-<a name="id2891004"></a><div class="titlepage">
+<a name="id2904179"></a><div class="titlepage">
<div><h6 class="title">
-<a name="id2891004"></a><span class="title">another sect5 title</span>
-</h6></div>
+<a name="id2904186"></a>another sect5 title</h6></div>
<div><h2 class="subtitle">a sect5 subtitle</h2></div>
</div>
<p>some text. some text. some text. some text. some text. some text.
@@ -2971,9 +3003,8 @@ some text. some text. some text. some text. some text. some text. some text. </p
</div>
</div>
<div class="sect1">
-<a name="id2891067"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2891067"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="id2904242"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2904242"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2982,9 +3013,8 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
<div class="sect1">
-<a name="id2891100"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2891100"></a><span class="title">another sect1 title</span>
-</h2></div></div>
+<a name="id2904275"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2904275"></a>another sect1 title</h2></div></div>
<p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -2993,20 +3023,21 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text. </p>
</div>
</div>
-<div class="bibliography">
-<h2 class="title"><a name="bib1">A Test Bibliography</a></h2>
+<div id="bib1" class="bibliography">
+<div class="titlepage"><div><h2 class="title">
+<a name="bib1"></a>A Test Bibliography</h2></div></div>
<p>The stock stylesheet attempts to do a Bibliography. It probably needs
a lot of tweaking. It probably doesn't conform to any specific style.</p>
<div class="bibliodiv">
-<h3 class="title"><a name="id2891167">Books</a></h3>
-<div id="id2891181" class="biblioentry">
-<a name="id2891181"></a><p>
-<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
+<h3 class="title"><a name="id2904342">Books</a></h3>
+<div id="id2904356" class="biblioentry">
+<a name="id2904356"></a><p>
+<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
</p>
</div>
</div>
<div class="bibliodiv">
-<h3 class="title"><a name="id2891414">Periodicals</a></h3>
+<h3 class="title"><a name="id2904589">Periodicals</a></h3>
<div id="walsh97" class="biblioentry">
<a name="walsh97"></a><p>
<span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span>
@@ -3022,8 +3053,8 @@ a lot of tweaking. It probably doesn't conform to any specific style.</p>
<span class="corpname">The World Wide Web Consortium</span>.
<span class="pubdate">Winter, 1996</span></span>.</p>
</div>
-<div id="id2891724" class="biblioentry">
-<a name="id2891724"></a><p>
+<div id="id2904900" class="biblioentry">
+<a name="id2904900"></a><p>
<span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
@@ -3056,22 +3087,25 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</div>
</div>
</div>
-<div class="glossary">
-<h2>Example Glossary</h2>
-<dl>
+<div id="gloss" class="glossary">
+<div class="titlepage"><div><h2 class="title">
+<a name="gloss"></a>Example Glossary</h2></div></div>
<p>This is not a real glossary, it's just an example.</p>
<div class="glossdiv">
<h3 class="title">E</h3>
+<dl>
<dt><a name="xml">Extensible Markup Language</a></dt>
<dd>
<p>Some reasonable definition here.</p>
<p>See Also <a href="#sgml">Standard Generalized
Markup Language</a>.</p>
</dd>
+</dl>
</div>
<div class="glossdiv">
<h3 class="title">S</h3>
-<dt><a name="id2892665">SGML</a></dt>
+<dl>
+<dt><a name="id2905840">SGML</a></dt>
<dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd>
<dt><a name="sgml">Standard Generalized
@@ -3080,11 +3114,12 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
<p>Some reasonable definition here.</p>
<p>See Also <a href="#xml">Extensible Markup Language</a>.</p>
</dd>
-</div>
</dl>
</div>
-<div class="index">
-<h2 class="title"><a name="index">Index</a></h2>
+</div>
+<div id="index" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="index"></a>Index</h2></div></div>
<p>This is a test index.</p>
<p>
<b>a formal para</b> this is a formal paragraph.</p>
@@ -3131,8 +3166,9 @@ USA. </span></span><span class="publishername">PublisherName. </span><span class
</dl></dd>
</dl></dd>
</div>
-<div class="index">
-<h2 class="title"><a name="id2893149">An Index with a Title</a></h2>
+<div id="id2906324" class="index">
+<div class="titlepage"><div><h2 class="title">
+<a name="id2906324"></a>An Index with a Title</h2></div></div>
<div class="indexdiv">Symbols<dl>
<dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
diff --git a/tests/docbook/result/html/docbook40.html b/tests/docbook/result/html/docbook40.html
index 8bae5fa6..d4093a34 100644
--- a/tests/docbook/result/html/docbook40.html
+++ b/tests/docbook/result/html/docbook40.html
@@ -3,16 +3,16 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>DocBook V4.0 Example Document</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599532">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2764244">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2599532"></a>DocBook V4.0 Example Document</h1></div>
+<a name="id2764244"></a>DocBook V4.0 Example Document</h1></div>
<div><h3 class="author">Norman Walsh</h3></div>
<div><div class="abstract">
<p>
-<a name="id2848522"></a><b>Abstract</b>
+<a name="id2861696"></a><b>Abstract</b>
</p>
<p>This document demonstrates the new tags in DocBook V4.0.</p>
<p>The focus of this document is to present examples of new elements,
@@ -24,27 +24,27 @@ included.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#id2848547">Block-level Markup</a>
+<dt>1 <a href="#id2861722">Block-level Markup</a>
</dt>
-<dt>2. <a href="#id2755926">Inline markup</a>
+<dt>2 <a href="#id2769271">Inline markup</a>
</dt>
</dl>
</div>
-<div id="id2848547" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2848547"></a>Chapter 1. Block-level Markup</h2></div></div>
+<a name="id2861722"></a>Chapter 1. Block-level Markup</h2></div></div>
<p>There's a new simple-alternative for <tt>msgentry</tt>:
<tt>simplemsgentry</tt>.</p>
<div class="simplemsgentry">
-<a name="id2751017"></a><p>The text of a message</p>
+<a name="id2600532"></a><p>The text of a message</p>
<div class="msgexplan">
-<a name="id2848605"></a><p>An explanation of the message.</p>
+<a name="id2861773"></a><p>An explanation of the message.</p>
</div>
</div>
<div class="simplemsgentry">
-<a name="id2874737"></a><p>The text of a message</p>
+<a name="id2861786"></a><p>The text of a message</p>
<div class="msgexplan">
-<a name="id2874754"></a><p>An explanation of the message.</p>
+<a name="id2887922"></a><p>An explanation of the message.</p>
</div>
</div>
<p>Longer descriptions are possible in a <tt>revhistory</tt>:
@@ -69,22 +69,22 @@ included.</p>
<p><b>Itemized List</b></p>
<ul>
<li><p>
-<a name="id2757400"></a>First thing</p></li>
+<a name="id2766994"></a>First thing</p></li>
<li><p>
-<a name="id2757411"></a>Second thing</p></li>
+<a name="id2767138"></a>Second thing</p></li>
<li><p>
-<a name="id2757421"></a>Third thing</p></li>
+<a name="id2767149"></a>Third thing</p></li>
</ul>
</div>
<div class="itemizedlist">
<p><b>Ordered List</b></p>
<ul>
<li><p>
-<a name="id2757445"></a>First thing</p></li>
+<a name="id2767173"></a>First thing</p></li>
<li><p>
-<a name="id2757456"></a>Second thing</p></li>
+<a name="id2767183"></a>Second thing</p></li>
<li><p>
-<a name="id2757466"></a>Third thing</p></li>
+<a name="id2767194"></a>Third thing</p></li>
</ul>
</div>
<p>Linespecific environments can indicate line numbering:</p>
@@ -102,11 +102,11 @@ object-oriented programming language classes. Here's one example:</p>
                           <span class="methodparam"><span class="type">String </span><span class="parameter">file</span></span>)
    throws <span class="exceptionname">SAXException</span>;</div>}</pre>
</div>
-<div id="id2755926" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755926"></a>Chapter 2. Inline markup</h2></div></div>
+<a name="id2769271"></a>Chapter 2. Inline markup</h2></div></div>
<p>The <tt>sgmltag</tt> element has new
-class attribute values:
+<tt>class</tt> attribute values:
<tt>xmlpi</tt> and
<tt>emptytag</tt>. These produce
<tt>&lt;?processing instructions?&gt;</tt>
diff --git a/tests/docbook/result/html/external.html b/tests/docbook/result/html/external.html
index 3d598301..dca970ae 100644
--- a/tests/docbook/result/html/external.html
+++ b/tests/docbook/result/html/external.html
@@ -3,29 +3,29 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Main document</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599580">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599618">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2599580"></a>Main document</h1></div>
+<a name="id2599618"></a>Main document</h1></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#main">Chapter</a>
+<dt>1 <a href="#main"></a>
</dt>
-<dt>2. <a href="#subdoc">Chapter</a>
+<dt>2 <a href="#subdoc"></a>
</dt>
</dl>
</div>
-<div id="main" class="chapter">
+<div class="chapter">
<div class="titlepage"></div>
-<p>This references to: <a href="#subdoc"></a>
+<p>This references to: <a href="#subdoc" title="Chapter 1. "></a>
</p>
</div>
-<div id="subdoc" class="chapter">
+<div class="chapter">
<div class="titlepage"></div>
<p>This is nothing, but a subdoc</p>
</div>
diff --git a/tests/docbook/result/html/figtest.html b/tests/docbook/result/html/figtest.html
index 8d432aa6..d8b7dc49 100644
--- a/tests/docbook/result/html/figtest.html
+++ b/tests/docbook/result/html/figtest.html
@@ -3,19 +3,19 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599542" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599542"></a>Article Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2600532"></a>Article Test Document Title</h2></div>
<hr>
</div>
<p>
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</p>
<div class="figure">
<p>
@@ -25,7 +25,7 @@ quotation'&#x201D;'&#x201D;.
ProgramListing
</pre>
</div>
-<p>This para contains an xref to a figure: <a href="#testfig1">Figure 1.</a>.
+<p>This para contains an xref to a figure: <a href="#testfig1" title="Figure 1. Test Figure">Figure 1. Test Figure</a>.
</p>
<div class="figure">
<p>
@@ -35,8 +35,8 @@ quotation'&#x201D;'&#x201D;.
Test Figure
</pre>
</div>
-<p>This para contains an <a href="#testfig2">link</a> to a
-figure. And an xref: <a href="#testfig2">Figure 2.</a>.
+<p>This para contains an <a href="#testfig2" title="Figure 2. Test Figure2">link</a> to a
+figure. And an xref: <a href="#testfig2" title="Figure 2. Test Figure2">Figure 2. Test Figure2</a>.
</p>
<div class="figure">
<p>
@@ -46,7 +46,7 @@ figure. And an xref: <a href="#testfig2">Figure 2.</a>.
ProgramListing
</pre>
</div>
-<p>This para contains an xref to a figure: <a href="#testfig3">Figure 3.</a>.
+<p>This para contains an xref to a figure: <a href="#testfig3" title="Figure 3. Test Figure">Figure 3. Test Figure</a>.
</p>
</div></body>
</html>
diff --git a/tests/docbook/result/html/foottest.html b/tests/docbook/result/html/foottest.html
index b1d0faf4..44648bb6 100644
--- a/tests/docbook/result/html/foottest.html
+++ b/tests/docbook/result/html/foottest.html
@@ -3,12 +3,12 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599542" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599542"></a>Article Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2600532"></a>Article Test Document Title</h2></div>
<div>
<h3 class="corpauthor">nwalsh</h3>
<h3 class="author">Norman Walsh</h3>
@@ -17,11 +17,11 @@
<h3 class="editor">Someother Editor</h3>
<h3 class="author">Someone Else</h3>
</div>
-<div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1999 Norman Walsh</p></div>
<div><p class="pubdate">Apr. 26, 1999</p></div>
<div><div class="abstract">
<p>
-<a name="id2753663"></a><b>Abstract</b>
+<a name="id2766885"></a><b>Abstract</b>
</p>
<p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
@@ -32,10 +32,14 @@ This article is just a test. This article is just a test.
</div></div>
<hr>
</div>
-<p>This is a footnote<sup>[<a name="id2753692" href="#ftn.id2753692">1</a>]</sup>.</p>
-<div class="informaltable" id="id2753704">
-<p>
-<a name="id2753704"></a><table border="1">
+<div class="toc">
+<p><b>Table of Contents</b></p>
+<dl><dt>A <a href="#id2765782">Appendix</a>
+</dt></dl>
+</div>
+<p>This is a footnote<sup>[<a name="id2766914" href="#ftn.id2766914">1</a>]</sup>.</p>
+<div class="informaltable" id="id2766926">
+<a name="id2766926"></a><table border="1">
<colgroup>
<col>
<col>
@@ -48,7 +52,7 @@ This article is just a test. This article is just a test.
<td>entry</td>
</tr>
<tr>
-<td>entry<sup>[<a name="id2753766" href="#ftn.id2753766">b</a>]</sup>
+<td>entry<sup>[<a name="id2766988" href="#ftn.id2766988">b</a>]</sup>
</td>
<td>entry</td>
<td>entry</td>
@@ -73,24 +77,23 @@ This article is just a test. This article is just a test.
</tbody>
<tr><td colspan="3">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2753766" href="#id2753766">b</a>] </sup>table cell footnote</p></div>
+<sup>[<a name="ftn.id2766988" href="#id2766988">b</a>] </sup>table cell footnote</p></div>
<div class="footnote"><p>
<sup>[<a name="ftn.ch15tb1" href="#ch15tb1">c</a>] </sup>
<i>Blended wines, made from two or more grapes</i>
</p></div>
</td></tr>
</table>
-<p>
</div>
-<div id="id2752560" class="appendix">
-<h2 class="title" style="clear: all">
-<a name="id2752560"></a>Appendix A. Appendix</h2>
+<div class="appendix">
+<h2 class="title" style="clear: both">
+<a name="id2765782"></a>A. Appendix</h2>
<p>This is just a test.</p>
</div>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p>
-<sup>[<a name="ftn.id2753692" href="#id2753692">1</a>] </sup>See?</p></div>
+<sup>[<a name="ftn.id2766914" href="#id2766914">1</a>] </sup>See?</p></div>
</div>
</div></body>
</html>
diff --git a/tests/docbook/result/html/fotest.html b/tests/docbook/result/html/fotest.html
index df3398cd..ddfc2609 100644
--- a/tests/docbook/result/html/fotest.html
+++ b/tests/docbook/result/html/fotest.html
@@ -3,12 +3,12 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799108">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770360">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799108"></a>Book Test Document Title</h1></div>
+<a name="id2770360"></a>Bookinfo Test Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
<hr>
@@ -16,17 +16,17 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2799164">Foreword</a>
+<dt> <a href="#id2770415">Foreword</a>
</dt>
-<dt>1. <a href="#id2761335">First Chapter</a>
+<dt>1 <a href="#id2812416">First Chapter</a>
</dt>
-<dt>A. <a href="#id2755424">First Appendix</a>
+<dt>A <a href="#id2768613">First Appendix</a>
</dt>
</dl>
</div>
-<div id="id2799164" class="preface">
+<div id="id2770415" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799164"></a>Foreword</h2></div></div>
+<a name="id2770415"></a>Foreword</h2></div></div>
<p>This is a test paragraph.</p>
<div class="table">
<p>
@@ -54,17 +54,17 @@
</table>
</div>
</div>
-<div id="id2761335" class="chapter">
+<div class="chapter">
<div class="titlepage">
<div><h2 class="title">
-<a name="id2761335"></a>Chapter 1. First Chapter</h2></div>
-<div><h2 class="subtitle">Chapter Subtitle</h2></div>
+<a name="id2812416"></a>Chapter 1. First Chapter</h2></div>
+<div><h3 class="subtitle"><i>Chapter Subtitle</i></h3></div>
</div>
<p>This is a test paragraph.</p>
</div>
-<div id="id2755424" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755424"></a>Appendix A. First Appendix</h2></div></div>
+<a name="id2768613"></a>Appendix A. First Appendix</h2></div></div>
<p>This is just a test.</p>
</div>
</div></body>
diff --git a/tests/docbook/result/html/func.html b/tests/docbook/result/html/func.html
index 02526a62..8624c167 100644
--- a/tests/docbook/result/html/func.html
+++ b/tests/docbook/result/html/func.html
@@ -3,9 +3,9 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Chapter 1. test</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="ch1" class="chapter">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ch1"></a>Chapter 1. test</h2></div></div>
<p>
diff --git a/tests/docbook/result/html/gdp-handbook.html b/tests/docbook/result/html/gdp-handbook.html
index f19e584c..ae8656f3 100644
--- a/tests/docbook/result/html/gdp-handbook.html
+++ b/tests/docbook/result/html/gdp-handbook.html
@@ -3,32 +3,35 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>The GNOME Handbook of Writing Software Documentation</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="index" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="index"></a>The GNOME Handbook of Writing Software Documentation</h1></div>
+<div><h2 class="title">
+<a name="index"></a>The GNOME Handbook of Writing Software Documentation</h2></div>
<div>
<h3 class="author">David Mason</h3>
<div class="affiliation">
-<span class="orgname">Red Hat, Inc.<br></span><pre class="address">
- <tt>&lt;<a href="mailto:dcm@redhat.com">dcm@redhat.com</a>&gt;</tt>
- </pre>
+<span class="orgname">Red Hat, Inc.<br></span><div class="address">
+<br>
+            <tt>&lt;<a href="mailto:dcm@redhat.com">dcm@redhat.com</a>&gt;</tt><br>
+          </div>
</div>
<h3 class="author">Daniel Mueth</h3>
-<div class="affiliation"><pre class="address">
- <tt>&lt;<a href="mailto:d-mueth@uchicago.edu">d-mueth@uchicago.edu</a>&gt;</tt>
- </pre></div>
+<div class="affiliation"><div class="address">
+<br>
+            <tt>&lt;<a href="mailto:d-mueth@uchicago.edu">d-mueth@uchicago.edu</a>&gt;</tt><br>
+          </div></div>
<h3 class="author">Alexander Kirillov</h3>
-<div class="affiliation"><pre class="address">
- <tt>&lt;<a href="mailto:kirillov@math.sunysb.edu">kirillov@math.sunysb.edu</a>&gt;</tt>
- </pre></div>
+<div class="affiliation"><div class="address">
+<br>
+            <tt>&lt;<a href="mailto:kirillov@math.sunysb.edu">kirillov@math.sunysb.edu</a>&gt;</tt><br>
+          </div></div>
</div>
-<div><span class="releaseinfo">
+<div><p class="releaseinfo">
This is a pre-release!
- <br></span></div>
-<div><p class="copyright">Copyright © 2000 by Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</p></div>
+ </p></div>
+<div><p class="copyright">Copyright © 2000 Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</p></div>
<div><div class="legalnotice">
<p>
Permission is granted to copy, distribute and/or modify this
@@ -182,20 +185,27 @@
<dt> <a href="#irc">IRC</a>
</dt>
</dl></dd>
+<dt>A <a href="#templates">Document Templates</a>
+</dt>
+<dd><dl>
+<dt> <a href="#template1">Template 1: Application Manual</a>
+</dt>
+<dt> <a href="#template2-1x">Template 2: Applet Manual For GNOME 1.x</a>
+</dt>
+<dt> <a href="#template2-2x">Template 2: Applet Manual For GNOME 2.x</a>
+</dt>
+</dl></dd>
</dl>
</div>
<div class="sect1">
-<a name="intro"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="intro"></a><span class="title">Introduction</span>
-</h2></div></div>
+<a name="intro"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="intro"></a>Introduction</h2></div></div>
<div class="sect2">
<a name="gdp"></a><div class="titlepage"><div><h3 class="title">
-<a name="gdp"></a><span class="title">The GNOME Documentation Project</span>
-</h3></div></div>
+<a name="gdp"></a>The GNOME Documentation Project</h3></div></div>
<div class="sect3">
<a name="goals"></a><div class="titlepage"><div><h4 class="title">
-<a name="goals"></a><span class="title">Goals</span>
-</h4></div></div>
+<a name="goals"></a>Goals</h4></div></div>
<p>
The GNOME Documentation Project (GDP) aims to provide GNOME
and GNOME applications with a complete, intuitive, and clear
@@ -222,8 +232,7 @@
</div>
<div class="sect3">
<a name="joining"></a><div class="titlepage"><div><h4 class="title">
-<a name="joining"></a><span class="title">Joining the GDP</span>
-</h4></div></div>
+<a name="joining"></a>Joining the GDP</h4></div></div>
<p>
Documenting GNOME and all the numerous GNOME applications is
a very large project. The GDP is always looking for people
@@ -231,7 +240,7 @@
interested in joining the GDP team, you should join the
<a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top">
<i>gnome-doc-list mailing list</i> </a>.
- Read <a href="#gettingstarted">the section called &#x201C;Getting Started Writing GNOME Documentation&#x201D;</a>, for help selecting a
+ Read <a href="#gettingstarted" title="Getting Started Writing GNOME Documentation">the section called &#x201C;Getting Started Writing GNOME Documentation&#x201D;</a>, for help selecting a
project to work on. Feel free to introduce yourself on the
gnome-doc-list mailing list and indicate which project you
intend to work on, or else ask for suggestions of important
@@ -245,8 +254,7 @@
</div>
<div class="sect3">
<a name="collaborating"></a><div class="titlepage"><div><h4 class="title">
-<a name="collaborating"></a><span class="title">Collaborating with the GDP</span>
-</h4></div></div>
+<a name="collaborating"></a>Collaborating with the GDP</h4></div></div>
<p>
GNOME developers, packagers, and translators may not be
writing GNOME documentation but will want to understand how
@@ -267,13 +275,11 @@
</div>
<div class="sect2">
<a name="notation"></a><div class="titlepage"><div><h3 class="title">
-<a name="notation"></a><span class="title">Notation and Conventions</span>
-</h3></div></div>
+<a name="notation"></a>Notation and Conventions</h3></div></div>
<p>
This Handbook uses the following notation:
- <div class="informaltable" id="id2761002">
-<p>
-<a name="id2761002"></a><table border="0">
+ <div class="informaltable" id="id2774119">
+<a name="id2774119"></a><table border="0">
<colgroup>
<col>
<col>
@@ -309,14 +315,12 @@
</tr>
</tbody>
</table>
-<p>
</div>
</p>
</div>
<div class="sect2">
<a name="about"></a><div class="titlepage"><div><h3 class="title">
-<a name="about"></a><span class="title">About This Handbook</span>
-</h3></div></div>
+<a name="about"></a>About This Handbook</h3></div></div>
<p>
This Handbook is a guide for both writing documentation for
GNOME components and applications and for properly binding and
@@ -334,17 +338,14 @@
</div>
</div>
<div class="sect1">
-<a name="gettingstarted"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="gettingstarted"></a><span class="title">Getting Started Writing GNOME Documentation</span>
-</h2></div></div>
+<a name="gettingstarted"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="gettingstarted"></a>Getting Started Writing GNOME Documentation</h2></div></div>
<div class="sect2">
<a name="selecting"></a><div class="titlepage"><div><h3 class="title">
-<a name="selecting"></a><span class="title">Selecting A Document</span>
-</h3></div></div>
+<a name="selecting"></a>Selecting A Document</h3></div></div>
<div class="sect3">
<a name="know"></a><div class="titlepage"><div><h4 class="title">
-<a name="know"></a><span class="title">Document Something You Know</span>
-</h4></div></div>
+<a name="know"></a>Document Something You Know</h4></div></div>
<p>
The most frequently asked question of new contributors who
join the GDP is &quot;which document should I start
@@ -372,8 +373,7 @@
</div>
<div class="sect3">
<a name="doctable"></a><div class="titlepage"><div><h4 class="title">
-<a name="doctable"></a><span class="title">The GNOME Documentation Status Table</span>
-</h4></div></div>
+<a name="doctable"></a>The GNOME Documentation Status Table</h4></div></div>
<p>
The <i>GDP Documentation Status Table</i>
(<i>DocTable</i>) (<a href="http://www.gnome.org/gdp/doctable/" target="_top">http://www.gnome.org/gdp/doctable/</a>) is a
@@ -399,7 +399,8 @@
issues in the comments section.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2752882">Note</a></h3>
+<h3 class="title">
+<a name="id2765857"></a>Note</h3>
<p>
Note that the information in the
<i>DocTable</i> may not always be up-to-date
@@ -412,8 +413,7 @@
</div>
<div class="sect2">
<a name="docbook"></a><div class="titlepage"><div><h3 class="title">
-<a name="docbook"></a><span class="title">Installing and Using DocBook</span>
-</h3></div></div>
+<a name="docbook"></a>Installing and Using DocBook</h3></div></div>
<p>
All documentation for the GNOME project is written in SGML
using the DocBook DTD. There are many advantages to using
@@ -422,7 +422,8 @@
learn to use DocBook.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2752963">NOTE</a></h3>
+<h3 class="title">
+<a name="id2765944"></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
@@ -435,8 +436,7 @@
</div>
<div class="sect3">
<a name="installingdocbook"></a><div class="titlepage"><div><h4 class="title">
-<a name="installingdocbook"></a><span class="title">Installing DocBook</span>
-</h4></div></div>
+<a name="installingdocbook"></a>Installing DocBook</h4></div></div>
<p>
Download and install the following <a href="ftp://sourceware.cygnus.com:/pub/docbook-tools/" target="_top">DocBook Tools packages</a>: jade, docbook,
jadetex, sgml-common, and stylesheets. (RPM users should note
@@ -453,8 +453,7 @@
</div>
<div class="sect3">
<a name="gdpstylesheets"></a><div class="titlepage"><div><h4 class="title">
-<a name="gdpstylesheets"></a><span class="title">GDP Stylesheets</span>
-</h4></div></div>
+<a name="gdpstylesheets"></a>GDP Stylesheets</h4></div></div>
<p>
The GDP uses its own DocBook stylesheets. To use the GDP
stylesheets, you should download the file
@@ -471,8 +470,7 @@
</div>
<div class="sect3">
<a name="gdpdtd"></a><div class="titlepage"><div><h4 class="title">
-<a name="gdpdtd"></a><span class="title">GDP DTD (PNG Image Support)</span>
-</h4></div></div>
+<a name="gdpdtd"></a>GDP DTD (PNG Image Support)</h4></div></div>
<p>
Due to some license issues involved with the creation of
gifs, the GNOME Documentation Project has decided to use the
@@ -492,7 +490,7 @@
</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2753356"></a>
+<a name="id2766321"></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
@@ -501,7 +499,7 @@
recommended that you use version 3.1
</p></li>
<li style="list-style-type: disc"><p>
-<a name="id2753524"></a>
+<a name="id2766488"></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
@@ -543,8 +541,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="editors"></a><div class="titlepage"><div><h4 class="title">
-<a name="editors"></a><span class="title">Editors</span>
-</h4></div></div>
+<a name="editors"></a>Editors</h4></div></div>
<p>
There are many editors on Linux and UNIX systems available
to you. Which editor you use to work on the sgml documents
@@ -561,13 +558,12 @@ V1.1//EN&quot;[]&gt;
and effort in adding and closing tags. You will find the
psgml package in DocBook Tools, which is the standard set of
tools for the GDP. You may find out more about DocBook Tools
- in <a href="#installingdocbook">the section called &#x201C;Installing DocBook&#x201D;</a>.
+ in <a href="#installingdocbook" title="Installing DocBook">the section called &#x201C;Installing DocBook&#x201D;</a>.
</p>
</div>
<div class="sect3">
<a name="make-output"></a><div class="titlepage"><div><h4 class="title">
-<a name="make-output"></a><span class="title">Creating Something Useful with your Docs</span>
-</h4></div></div>
+<a name="make-output"></a>Creating Something Useful with your Docs</h4></div></div>
<p>
The tools available in DocBook Tools allow you to convert
your sgml document to many different formats including html
@@ -601,21 +597,21 @@ V1.1//EN&quot;[]&gt;
view the resulting .ps file.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2753431">NOTE</a></h3>
+<h3 class="title">
+<a name="id2766394"></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
Tools' default stylesheets will produce a different look
to your docs. You can read more about the GDP stylesheets
- in <a href="#gdpstylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
+ in <a href="#gdpstylesheets" title="GDP Stylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
</p>
</div>
</div>
<div class="sect3">
<a name="jadeimages"></a><div class="titlepage"><div><h4 class="title">
-<a name="jadeimages"></a><span class="title">Images in DocBook Tools</span>
-</h4></div></div>
+<a name="jadeimages"></a>Images in DocBook Tools</h4></div></div>
<p>
If your document uses images you will need to take note of a
few things that should take place in order for you to make
@@ -665,8 +661,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="moredocbookinfo"></a><div class="titlepage"><div><h4 class="title">
-<a name="moredocbookinfo"></a><span class="title">Learning DocBook</span>
-</h4></div></div>
+<a name="moredocbookinfo"></a>Learning DocBook</h4></div></div>
<p>
There are many resources available to help you learn DocBook.
The following resources on the web are useful for learning
@@ -674,7 +669,7 @@ V1.1//EN&quot;[]&gt;
</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2875346"></a>
+<a name="id2888519"></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
@@ -682,14 +677,14 @@ V1.1//EN&quot;[]&gt;
too formal for a beginner.
</p></li>
<li><p>
-<a name="id2875402"></a>
+<a name="id2888575"></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><p>
-<a name="id2875442"></a>
+<a name="id2888615"></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
@@ -697,7 +692,7 @@ V1.1//EN&quot;[]&gt;
was.
</p></li>
<li><p>
-<a name="id2875482"></a>
+<a name="id2888655"></a>
<a href="http://www.freebsd.org/tutorials/docproj-primer/" target="_top">
FreeBSD Documentation Project Primer for New
Contributors</a> - FreeBSD documentation project
@@ -715,8 +710,8 @@ V1.1//EN&quot;[]&gt;
documentation authors write correct and consistent DocBook:
</p>
<div class="itemizedlist"><ul><li><p>
-<a name="id2875548"></a>
- <a href="#docbookbasics">the section called &#x201C;DocBook Basics &#x201D;</a> - Descriptions of
+<a name="id2888722"></a>
+ <a href="#docbookbasics" title="DocBook Basics ">the section called &#x201C;DocBook Basics &#x201D;</a> - Descriptions of
commonly used DocBook tags.
</p></li></ul></div>
<p>
@@ -728,11 +723,10 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="gdptemplates"></a><div class="titlepage"><div><h3 class="title">
-<a name="gdptemplates"></a><span class="title">GDP Document Templates</span>
-</h3></div></div>
+<a name="gdptemplates"></a>GDP Document Templates</h3></div></div>
<p>
Templates for various types of GNOME documents are found in
- <a href="#templates">Appendix A.</a>. They are kept in CVS in
+ <a href="#templates" title="A. Document Templates">Appendix A. Document Templates</a>. They are kept in CVS in
gnome-docu/gdp/templates. The easiest source to get them from
is probably the <a href="http://developer.gnome.org/projects/gdp/templates.html" target="_top">GDP
Document Templates</a> web page, which is typically kept
@@ -742,21 +736,19 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="screenshots"></a><div class="titlepage"><div><h3 class="title">
-<a name="screenshots"></a><span class="title">Screenshots</span>
-</h3></div></div>
+<a name="screenshots"></a>Screenshots</h3></div></div>
<p>
Most GNOME documents will have screenshots of the particular
applet, application, GNOME component, or widget being
- discussed. As discussed above in <a href="#gdpdtd">the section called &#x201C;GDP DTD (PNG Image Support)&#x201D;</a> you
+ discussed. As discussed above in <a href="#gdpdtd" title="GDP DTD (PNG Image Support)">the section called &#x201C;GDP DTD (PNG Image Support)&#x201D;</a> you
will need to install the special GDP DocBook DTD which
supports PNG images, the format used for all images in GNOME
documentation. For the basic DocBook structure used to insert
- images in a document, see <a href="#jadeimages">the section called &#x201C;Images in DocBook Tools&#x201D;</a> above.
+ images in a document, see <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a> above.
</p>
<div class="sect3">
<a name="screenshotappearance"></a><div class="titlepage"><div><h4 class="title">
-<a name="screenshotappearance"></a><span class="title">Screenshot Appearance</span>
-</h4></div></div>
+<a name="screenshotappearance"></a>Screenshot Appearance</h4></div></div>
<p>
For all screenshots of windows that typically have border
decorations (e.g. applications and dialogs, but not applets
@@ -782,8 +774,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="screenshottools"></a><div class="titlepage"><div><h4 class="title">
-<a name="screenshottools"></a><span class="title">Screenshot Tools</span>
-</h4></div></div>
+<a name="screenshottools"></a>Screenshot Tools</h4></div></div>
<p>
There are many tools for taking screenshots in
GNOME/Linux. Perhaps the most convenient is the
@@ -809,14 +800,13 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="screenshotfiles"></a><div class="titlepage"><div><h4 class="title">
-<a name="screenshotfiles"></a><span class="title">Screenshot Files</span>
-</h4></div></div>
+<a name="screenshotfiles"></a>Screenshot Files</h4></div></div>
<p>
Screenshots should be kept in the main documentation
directory with your SGML file for applets, or should be
kept in a directory called &quot;figs&quot; for application and other
documentation. After you use <b>db2html</b> to
- convert your SGML file to HTML (see <a href="#make-output">the section called &#x201C;Creating Something Useful with your Docs&#x201D;</a>), you will need to copy your
+ convert your SGML file to HTML (see <a href="#make-output" title="Creating Something Useful with your Docs">the section called &#x201C;Creating Something Useful with your Docs&#x201D;</a>), you will need to copy your
screenshots (either the individual PNG files for applet
documentation, or the whole &quot;figs&quot; directory for other
documentation) into the newly created HTML directory. Note
@@ -824,7 +814,7 @@ V1.1//EN&quot;[]&gt;
directory is erased and rewritten, so do not store your only
copy of the screenshots in that directory. If you wish to
create PostScript or PDF output, you will need to manually
- convert the PNG images to EPS as described in <a href="#jadeimages">the section called &#x201C;Images in DocBook Tools&#x201D;</a>, but will not need to copy these
+ convert the PNG images to EPS as described in <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a>, but will not need to copy these
images from their default location, as they are included
directly into the output(PostScript of PDF) file.
</p>
@@ -832,8 +822,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="applicationbugs"></a><div class="titlepage"><div><h3 class="title">
-<a name="applicationbugs"></a><span class="title">Application Bugs</span>
-</h3></div></div>
+<a name="applicationbugs"></a>Application Bugs</h3></div></div>
<p>
Documentation authors tend to investigate and test applets and
applications more thoroughly than most
@@ -851,8 +840,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="cvs"></a><div class="titlepage"><div><h3 class="title">
-<a name="cvs"></a><span class="title">Using CVS</span>
-</h3></div></div>
+<a name="cvs"></a>Using CVS</h3></div></div>
<p>
CVS (Concurrent Versions System) is a tool that allows
multiple developers to concurrently work on a set of
@@ -870,8 +858,7 @@ V1.1//EN&quot;[]&gt;
</p>
<div class="sect3">
<a name="anonymouscvs"></a><div class="titlepage"><div><h4 class="title">
-<a name="anonymouscvs"></a><span class="title">Anonymous CVS</span>
-</h4></div></div>
+<a name="anonymouscvs"></a>Anonymous CVS</h4></div></div>
<p>
To anonymously check out documents from CVS, you must first
log in. From the bash shell, you should set your CVSROOT
@@ -889,8 +876,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="logincvs"></a><div class="titlepage"><div><h4 class="title">
-<a name="logincvs"></a><span class="title">Login CVS</span>
-</h4></div></div>
+<a name="logincvs"></a>Login CVS</h4></div></div>
<p> If you have been given a
login for the GNOME CVS server, you may commit your file
modifications to CVS. Be sure to read the following section
@@ -922,8 +908,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="cvsetiquette"></a><div class="titlepage"><div><h4 class="title">
-<a name="cvsetiquette"></a><span class="title">CVS Etiquette</span>
-</h4></div></div>
+<a name="cvsetiquette"></a>CVS Etiquette</h4></div></div>
<p>
Because files in CVS are typically used and modified by
multiple developers and documentation authors, users should
@@ -944,13 +929,11 @@ V1.1//EN&quot;[]&gt;
</div>
</div>
<div class="sect1">
-<a name="gnomedocsystem"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="gnomedocsystem"></a><span class="title">The GNOME Documentation System</span>
-</h2></div></div>
+<a name="gnomedocsystem"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="gnomedocsystem"></a>The GNOME Documentation System</h2></div></div>
<div class="sect2">
<a name="gnomehelpbrowser"></a><div class="titlepage"><div><h3 class="title">
-<a name="gnomehelpbrowser"></a><span class="title">The GNOME Help Browser</span>
-</h3></div></div>
+<a name="gnomehelpbrowser"></a>The GNOME Help Browser</h3></div></div>
<p>
At the core of the GNOME help system is the GNOME
Help Browser. The Help
@@ -970,8 +953,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="gnomehelpbrowser2"></a><div class="titlepage"><div><h3 class="title">
-<a name="gnomehelpbrowser2"></a><span class="title">The GNOME Help Browser (GNOME-2.0)</span>
-</h3></div></div>
+<a name="gnomehelpbrowser2"></a>The GNOME Help Browser (GNOME-2.0)</h3></div></div>
<p> In
GNOME 2.0, the GNOME Help Browser
will be replaced by Nautilus.
@@ -994,8 +976,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="gnomehelponthefly"></a><div class="titlepage"><div><h3 class="title">
-<a name="gnomehelponthefly"></a><span class="title">Dynamic Document Synthesis(GNOME-2.0)</span>
-</h3></div></div>
+<a name="gnomehelponthefly"></a>Dynamic Document Synthesis(GNOME-2.0)</h3></div></div>
<p>
GNOME uses the documentation presented by all the various
GNOME components and applications installed on the system to
@@ -1013,25 +994,22 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="gnomehelpcomponents"></a><div class="titlepage"><div><h3 class="title">
-<a name="gnomehelpcomponents"></a><span class="title">The GNOME Documentation Components</span>
-</h3></div></div>
+<a name="gnomehelpcomponents"></a>The GNOME Documentation Components</h3></div></div>
<div class="sect3">
<a name="applicationmanualsintro"></a><div class="titlepage"><div><h4 class="title">
-<a name="applicationmanualsintro"></a><span class="title">Application Manuals</span>
-</h4></div></div>
+<a name="applicationmanualsintro"></a>Application Manuals</h4></div></div>
<p>
Every GNOME application should have an application manual.
An application manual is a document specific to the
particular application which explains the various windows
and features of the application. Application Manuals
typically use screenshots (PNG format) for clarity. Writing
- application manuals is discussed in more detail in <a href="#writingapplicationmanuals">the section called &#x201C;Writing Application and Applet Manuals&#x201D;</a> below.
+ application manuals is discussed in more detail in <a href="#writingapplicationmanuals" title="Writing Application and Applet Manuals">the section called &#x201C;Writing Application and Applet Manuals&#x201D;</a> below.
</p>
</div>
<div class="sect3">
<a name="applicationhelpintro"></a><div class="titlepage"><div><h4 class="title">
-<a name="applicationhelpintro"></a><span class="title">Application Help</span>
-</h4></div></div>
+<a name="applicationhelpintro"></a>Application Help</h4></div></div>
<p>
Applications should have a Help
button on screens on which users may need help. These
@@ -1042,14 +1020,13 @@ V1.1//EN&quot;[]&gt;
GNOME Help Browser. The help
browser should show either the first page of the application
manual, or else the relevant page thereof. Application help
- is described in more detail in <a href="#applicationhelpbuttons">the section called &#x201C;Application Help Buttons&#x201D;</a> below.
+ is described in more detail in <a href="#applicationhelpbuttons" title="Application Help Buttons">the section called &#x201C;Application Help Buttons&#x201D;</a> below.
</p>
</div>
<div class="sect3">
<a name="contextsensitivehelpintro"></a><div class="titlepage"><div><h4 class="title">
-<a name="contextsensitivehelpintro"></a><span class="title">Application Context Sensitive Help (coming in
- GNOME-2.0)</span>
-</h4></div></div>
+<a name="contextsensitivehelpintro"></a>Application Context Sensitive Help (coming in
+ GNOME-2.0)</h4></div></div>
<p>
Context sensitive help is a system which will allow the user
to query any part (button, widget, etc.) of an application
@@ -1057,14 +1034,13 @@ V1.1//EN&quot;[]&gt;
clicking on an icon or by right clicking on the application
part and selecting &quot;What's This&quot; or whatever is decided on
at the time. Context sensitive help is described in more
- detail in <a href="#writingcontextsensitivehelp">the section called &#x201C;Writing Context Sensitive Help (coming in GNOME-2.0)&#x201D;</a>
+ detail in <a href="#writingcontextsensitivehelp" title="Writing Context Sensitive Help (coming in GNOME-2.0)">the section called &#x201C;Writing Context Sensitive Help (coming in GNOME-2.0)&#x201D;</a>
below.
</p>
</div>
<div class="sect3">
<a name="userguide"></a><div class="titlepage"><div><h4 class="title">
-<a name="userguide"></a><span class="title">The GNOME User Guide</span>
-</h4></div></div>
+<a name="userguide"></a>The GNOME User Guide</h4></div></div>
<p>
The <i>GNOME User Guide</i> describes the
GNOME desktop environment and core components of GNOME such
@@ -1078,8 +1054,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="userdocs"></a><div class="titlepage"><div><h4 class="title">
-<a name="userdocs"></a><span class="title">User Documents</span>
-</h4></div></div>
+<a name="userdocs"></a>User Documents</h4></div></div>
<p>
Aside from the <i>GNOME User Guide</i>,
there are several other documents to help GNOME users learn
@@ -1091,8 +1066,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="developerdocs"></a><div class="titlepage"><div><h4 class="title">
-<a name="developerdocs"></a><span class="title">Developer Documents</span>
-</h4></div></div>
+<a name="developerdocs"></a>Developer Documents</h4></div></div>
<p>
There are many White Papers, Tutorials, HOWTO's and FAQ's to
make programming GNOME and GNOME applications as easy as
@@ -1107,8 +1081,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="projectdocs"></a><div class="titlepage"><div><h4 class="title">
-<a name="projectdocs"></a><span class="title">Project Documents</span>
-</h4></div></div>
+<a name="projectdocs"></a>Project Documents</h4></div></div>
<p>
Some GNOME projects have documentation to maintain
consistency in their product and to help new contributors
@@ -1119,13 +1092,11 @@ V1.1//EN&quot;[]&gt;
</div>
</div>
<div class="sect1">
-<a name="docbookbasics"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="docbookbasics"></a><span class="title">DocBook Basics </span>
-</h2></div></div>
+<a name="docbookbasics"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="docbookbasics"></a>DocBook Basics </h2></div></div>
<div class="sect2">
<a name="introtodocbook"></a><div class="titlepage"><div><h3 class="title">
-<a name="introtodocbook"></a><span class="title">Introduction to DocBook</span>
-</h3></div></div>
+<a name="introtodocbook"></a>Introduction to DocBook</h3></div></div>
<p>
To understand DocBook, a basic understanding of SGML is
helpful. SGML stands for Standard General Markup Language and
@@ -1149,7 +1120,7 @@ V1.1//EN&quot;[]&gt;
readable format, you need special tools. The GDP uses <i>DocBook
Tools</i>, a free package of utilities for working with DocBook
which includes <i>Jade</i>, which does the SGML/DSSL
- parsing. You can read more about DocBook Tools in <a href="#installingdocbook">the section called &#x201C;Installing DocBook&#x201D;</a>.
+ parsing. You can read more about DocBook Tools in <a href="#installingdocbook" title="Installing DocBook">the section called &#x201C;Installing DocBook&#x201D;</a>.
</p>
<p>
The final appearance of the output (e.g. PostScript or HTML)
@@ -1162,7 +1133,7 @@ V1.1//EN&quot;[]&gt;
numbering style, and much more. DocBook tools come with a
collection of stylesheets (Norman Walsh's modular
stylesheets); GNOME Document Project uses some customized
- version of this stylesheets -- see <a href="#gdpstylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
+ version of this stylesheets -- see <a href="#gdpstylesheets" title="GDP Stylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
</p>
<p>
The advantage of specifying the <i>structure</i>
@@ -1193,16 +1164,15 @@ V1.1//EN&quot;[]&gt;
</p>
<p>
As stated before, the GDP uses the DocBook DTD. For a list of
- introductory and reference resources on DocBook, see <a href="#resources">the section called &#x201C;Resources&#x201D;</a>. The following sections also provide
+ introductory and reference resources on DocBook, see <a href="#resources" title="Resources">the section called &#x201C;Resources&#x201D;</a>. The following sections also provide
convenient instructions on which markup tags to use in various
- circumstances. Be sure to read <a href="#conventions">the section called &#x201C;GDP Documentation Conventions &#x201D;</a>
+ circumstances. Be sure to read <a href="#conventions" title="GDP Documentation Conventions ">the section called &#x201C;GDP Documentation Conventions &#x201D;</a>
for GDP documentation-specific guidelines.
</p>
</div>
<div class="sect2">
<a name="xml"></a><div class="titlepage"><div><h3 class="title">
-<a name="xml"></a><span class="title">XML and SGML</span>
-</h3></div></div>
+<a name="xml"></a>XML and SGML</h3></div></div>
<p> In not so distant future (probably before GNOME 2.0),
DocBook itself and GNOME Documentation project will migrate from
SGML to XML. This transition should be relatively painless:
@@ -1215,10 +1185,10 @@ V1.1//EN&quot;[]&gt;
</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2877840"></a><span class="term"> <i>Minimization</i></span>
+<a name="id2891013"></a><span class="term"> <i>Minimization</i></span>
</dt>
<dd><p>
-<a name="id2877859"></a>
+<a name="id2891032"></a>
It is possible with some implementations of SGML to use
minimizations to close elements in a document by using
&lt;/&gt;, for example:
@@ -1231,10 +1201,10 @@ V1.1//EN&quot;[]&gt;
Modify-&gt;Normalize.
</p></dd>
<dt>
-<a name="id2877942"></a><span class="term"> <i>Self-closing tags</i></span>
+<a name="id2891115"></a><span class="term"> <i>Self-closing tags</i></span>
</dt>
<dd><p>
-<a name="id2877962"></a>
+<a name="id2891135"></a>
Also, in SGML some tags are allowed not to have closing
tags. For example, it is legal for
<tt>&lt;xref&gt;</tt> not to have a closing tag:
@@ -1246,10 +1216,10 @@ V1.1//EN&quot;[]&gt;
slash!).
</p></dd>
<dt>
-<a name="id2878014"></a><span class="term"> <i>Case sensitive tags</i></span>
+<a name="id2891188"></a><span class="term"> <i>Case sensitive tags</i></span>
</dt>
<dd><p>
-<a name="id2878034"></a>
+<a name="id2891207"></a>
In XML, unlike SGML, tags are case-senstive
<tt>&lt;title&gt;</tt> and
<tt>&lt;TITLE&gt;</tt> are different tags!
@@ -1261,12 +1231,10 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect2">
<a name="structure"></a><div class="titlepage"><div><h3 class="title">
-<a name="structure"></a><span class="title"> Structure Elements</span>
-</h3></div></div>
+<a name="structure"></a> Structure Elements</h3></div></div>
<div class="sect3">
<a name="section"></a><div class="titlepage"><div><h4 class="title">
-<a name="section"></a><span class="title">Sections and paragraphs</span>
-</h4></div></div>
+<a name="section"></a>Sections and paragraphs</h4></div></div>
<p>
Top-level element of a book body must be
<tt>&lt;chapter&gt;</tt>; it may contain one or more
@@ -1291,8 +1259,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="notes"></a><div class="titlepage"><div><h4 class="title">
-<a name="notes"></a><span class="title">Notes, Warnings, And Tips</span>
-</h4></div></div>
+<a name="notes"></a>Notes, Warnings, And Tips</h4></div></div>
<p>
For notes, tips, warnings, and important information, which
should be set apart from the main text (usually as a
@@ -1311,7 +1278,8 @@ V1.1//EN&quot;[]&gt;
&lt;/tip&gt; </pre> produces
</p>
<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="extip">TIP</a></h3>
+<h3 class="title">
+<a name="extip"></a>TIP</h3>
<p>
To speed up program compilation, use
gcc compiler with Pentium
@@ -1324,8 +1292,7 @@ V1.1//EN&quot;[]&gt;
</div>
<div class="sect3">
<a name="figures"></a><div class="titlepage"><div><h4 class="title">
-<a name="figures"></a><span class="title"> Screenshots and other figures</span>
-</h4></div></div>
+<a name="figures"></a> Screenshots and other figures</h4></div></div>
<p>
To include screenshots and other figures, use the following
tags:
@@ -1352,18 +1319,18 @@ V1.1//EN&quot;[]&gt;
</div>
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2878505">NOTE</a></h3>
+<h3 class="title">
+<a name="id2891678"></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">the section called &#x201C;Images in DocBook Tools&#x201D;</a>.
+ why, please read <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a>.
</p>
</div>
</div>
<div class="sect3">
<a name="listing"></a><div class="titlepage"><div><h4 class="title">
-<a name="listing"></a><span class="title">Program listings and terminal session</span>
-</h4></div></div>
+<a name="listing"></a>Program listings and terminal session</h4></div></div>
<p>
To show a file fragment--for example, program
listing--use <tt>&lt;programlisting&gt;</tt> tag:
@@ -1410,7 +1377,8 @@ make: *** No rule to make target `love'. Stop.
<tt>&lt;userinput&gt;</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="id2878718">NOTE</a></h3>
+<h3 class="title">
+<a name="id2891891"></a>NOTE</h3>
<p>
Note that both <tt>&lt;programlisting&gt;</tt>
and <tt>&lt;screen&gt;</tt> preserve linebreaks,
@@ -1424,8 +1392,7 @@ make: *** No rule to make target `love'. Stop.
</div>
<div class="sect3">
<a name="lists"></a><div class="titlepage"><div><h4 class="title">
-<a name="lists"></a><span class="title"> Lists</span>
-</h4></div></div>
+<a name="lists"></a> Lists</h4></div></div>
<p>
The most common list types in DocBook are
<tt>&lt;itemizedlist&gt;</tt>,
@@ -1434,11 +1401,11 @@ make: *** No rule to make target `love'. Stop.
</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2878837"></a><span class="term"> <tt>&lt;itemizedlist&gt;</tt></span>
+<a name="id2892010"></a><span class="term"> <tt>&lt;itemizedlist&gt;</tt></span>
</dt>
<dd>
<p>
-<a name="id2878856"></a>
+<a name="id2892030"></a>
This is the simplest unnumbered list, parallel to
<tt>&lt;ul&gt;</tt> in HTML. Here is an example:
<pre class="programlisting">
@@ -1472,20 +1439,20 @@ make: *** No rule to make target `love'. Stop.
</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2878874"></a>
+<a name="id2892048"></a>
Show backup files --
This will show any backup file that might be on
your system.
</p></li>
<li><p>
-<a name="id2878937"></a>
+<a name="id2892110"></a>
Show hidden files --
This will show all &quot;dot files&quot; or files that
begin with a dot. This files typically include
configuration files and directories.
</p></li>
<li><p>
-<a name="id2878964"></a>
+<a name="id2892137"></a>
Mix files and directories
-- This option will display files and
directories in the order you sort them instead
@@ -1493,24 +1460,25 @@ make: *** No rule to make target `love'. Stop.
</p></li>
</ul></div>
<p> Note the use of <tt>&amp;mdash;</tt>
- for long dash (see <a href="#specsymb">the section called &#x201C; Special symbols &#x201D;</a>). Also,
+ for long dash (see <a href="#specsymb" title=" Special symbols ">the section called &#x201C; Special symbols &#x201D;</a>). Also,
please note that the result looks much nicer because the
terms being explained (Show backup
files, etc.) are set in a different font. In
- this case, it was achieved by using <a href="#gui"><tt>&lt;guilabel&gt;</tt></a>
+ this case, it was achieved by using <a href="#gui" title="GUI elements"><tt>&lt;guilabel&gt;</tt></a>
tag. In other cases, use appropriate tags such as
- <a href="#gui"><tt>&lt;guimenuitem&gt;</tt></a>,
- <a href="#filenames"><tt>&lt;command&gt;</tt></a>,
+ <a href="#gui" title="GUI elements"><tt>&lt;guimenuitem&gt;</tt></a>,
+ <a href="#filenames" title="Filenames, commands, and other
+ computer-related things"><tt>&lt;command&gt;</tt></a>,
or -- if none of
this applies -- use
- <a href="#gui"><tt>&lt;emphasis&gt;</tt></a>.
+ <a href="#gui" title="GUI elements"><tt>&lt;emphasis&gt;</tt></a>.
</p>
</dd>
<dt>
-<a name="id2879130"></a><span class="term"> <tt>&lt;orderedlist&gt;</tt></span>
+<a name="id2892304"></a><span class="term"> <tt>&lt;orderedlist&gt;</tt></span>
</dt>
<dd><p>
-<a name="id2879148"></a>
+<a name="id2892321"></a>
This list is completely analogous to
<tt>&lt;itemizedlist&gt;</tt> and has the same
syntax, but it produces numbered list. By default,
@@ -1525,10 +1493,10 @@ make: *** No rule to make target `love'. Stop.
<tt>lowerroman</tt>.
</p></dd>
<dt>
-<a name="id2879228"></a><span class="term"> <tt>&lt;variablelist&gt;</tt></span>
+<a name="id2892402"></a><span class="term"> <tt>&lt;variablelist&gt;</tt></span>
</dt>
<dd><p>
-<a name="id2879248"></a> This list is used when each entry is
+<a name="id2892421"></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>&lt;variablelist&gt;</tt> is more complicated
@@ -1576,20 +1544,18 @@ make: *** No rule to make target `love'. Stop.
</div>
<div class="sect2">
<a name="inline"></a><div class="titlepage"><div><h3 class="title">
-<a name="inline"></a><span class="title">Inline Elements</span>
-</h3></div></div>
+<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><span class="title">GUI elements</span>
-</h4></div></div>
+<a name="gui"></a>GUI elements</h4></div></div>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2879406"></a>
+<a name="id2892579"></a>
<tt>&lt;guibutton&gt;</tt> -- used for
buttons, including checkbuttons and radio buttons
</p></li>
<li><p>
-<a name="id2879432"></a>
+<a name="id2892605"></a>
<tt>&lt;guimenu&gt;</tt>,
<tt>&lt;guisubmenu&gt;</tt> --used for
top-level menus and submenus
@@ -1598,21 +1564,21 @@ make: *** No rule to make target `love'. Stop.
&lt;guimenu&gt;Main Menu&lt;/guimenu&gt;</tt>
</p></li>
<li><p>
-<a name="id2879476"></a>
+<a name="id2892649"></a>
<tt>&lt;guimenuitem&gt;</tt>--an entry in a
menu
</p></li>
<li><p>
-<a name="id2879502"></a>
+<a name="id2892675"></a>
<tt>&lt;guiicon&gt;</tt>--an icon
</p></li>
<li><p>
-<a name="id2879525"></a>
+<a name="id2892698"></a>
<tt>&lt;guilabel&gt;</tt>--for items which have
labels, like tabs, or bounding boxes.
</p></li>
<li><p>
-<a name="id2879550"></a>
+<a name="id2892724"></a>
<tt>&lt;interface&gt;</tt>-- for most everything
else... a window, a dialog box, the Panel, etc.
</p></li>
@@ -1632,8 +1598,7 @@ make: *** No rule to make target `love'. Stop.
</div>
<div class="sect3">
<a name="links"></a><div class="titlepage"><div><h4 class="title">
-<a name="links"></a><span class="title">Links and references</span>
-</h4></div></div>
+<a name="links"></a>Links and references</h4></div></div>
<p>
To refer to another place in the same document, you can use
tags <tt>&lt;xref&gt;</tt> and
@@ -1645,11 +1610,11 @@ make: *** No rule to make target `love'. Stop.
An example of a &lt;link linkend=&quot;extip&quot;&gt;tip&lt;/link&gt; was given in
&lt;xref linkend=&quot;notes&quot; /&gt;.
</pre>
- which produces: An example of a <a href="#extip">tip</a> was given in <a href="#notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a>.
+ which produces: An example of a <a href="#extip">tip</a> was given in <a href="#notes" title="Notes, Warnings, And Tips">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a>.
</p>
<p>
Here <tt>notes</tt> and <tt>extip</tt>
- are the id attributes of <a href="#notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a> and of the
+ are the id attributes of <a href="#notes" title="Notes, Warnings, And Tips">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a> and of the
example of a tip in it.
</p>
<p> To produce a link to an external source, such as a
@@ -1670,16 +1635,15 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="filenames"></a><div class="titlepage"><div><h4 class="title">
-<a name="filenames"></a><span class="title">Filenames, commands, and other
- computer-related things</span>
-</h4></div></div>
+<a name="filenames"></a>Filenames, commands, and other
+ 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="id2879907"></a> <tt>&lt;filename&gt;</tt> -- used
+<a name="id2893081"></a> <tt>&lt;filename&gt;</tt> -- used
for filenames,
e.g.<tt>&lt;filename&gt;</tt>
foo.sgml
@@ -1687,7 +1651,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
produces: <tt>foo.sgml</tt>.
</p></li>
<li><p>
-<a name="id2879957"></a> <tt>&lt;filename
+<a name="id2893130"></a> <tt>&lt;filename
class=&quot;directory&quot;&gt;</tt> -- used for
directories, e.g.<tt>&lt;filename
class=&quot;directory&quot;&gt;</tt>/usr/bin
@@ -1695,7 +1659,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
produces: <tt>/usr/bin</tt>.
</p></li>
<li><p>
-<a name="id2880013"></a>
+<a name="id2893186"></a>
<tt>&lt;application&gt;</tt> -- used for
application names,
e.g. <tt>&lt;application&gt;</tt>Gnumeric
@@ -1703,13 +1667,13 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
Gnumeric.
</p></li>
<li><p>
-<a name="id2880063"></a>
+<a name="id2893236"></a>
<tt>&lt;envar&gt;</tt> -- used for
environment variables, e.g.
<tt>&lt;envar&gt;</tt>PATH<tt>&lt;/envar&gt;</tt>.
</p></li>
<li><p>
-<a name="id2880104"></a>
+<a name="id2893277"></a>
<tt>&lt;command&gt;</tt> -- used for
commands entered on command line, e.g.
<tt>&lt;command&gt;</tt>make install
@@ -1717,7 +1681,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<b>make install</b>.
</p></li>
<li><p>
-<a name="id2880154"></a>
+<a name="id2893327"></a>
<tt>&lt;replaceable&gt;</tt> -- used for
replaceable text, e.g.
<tt>&lt;command&gt;</tt>db2html<tt>&lt;replaceable&gt;</tt>
@@ -1730,8 +1694,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="keys"></a><div class="titlepage"><div><h4 class="title">
-<a name="keys"></a><span class="title">Keyboard input</span>
-</h4></div></div>
+<a name="keys"></a>Keyboard input</h4></div></div>
<p> To mark up text input by the user, use
<tt>&lt;userinput&gt;</tt>.
</p>
@@ -1742,9 +1705,9 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
other tags for keys, too: <tt>&lt;keysym&gt;</tt>
and <tt>&lt;keycode&gt;</tt>. However you are
unlikely to need these for most documentation. For reference,
- <tt>&lt;keysym&gt;</tt> is for the `symbolic
- name' of a key. <tt>&lt;keycode&gt;</tt> is
- for the `scan code' of a key. These are not
+ <tt>&lt;keysym&gt;</tt> is for the &#x2018;symbolic
+ name&#x2019; of a key. <tt>&lt;keycode&gt;</tt> is
+ for the &#x2018;scan code&#x2019; of a key. These are not
terms commonly required in GNOME documentation,
although <tt>&lt;keysym&gt;</tt> is useful for marking
up control codes.
@@ -1779,8 +1742,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="email"></a><div class="titlepage"><div><h4 class="title">
-<a name="email"></a><span class="title">E-mail addresses</span>
-</h4></div></div>
+<a name="email"></a>E-mail addresses</h4></div></div>
<p> To mark up e-mail
address, use <tt>&lt;email&gt;</tt>:
<pre class="programlisting">
@@ -1795,8 +1757,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="specsymb"></a><div class="titlepage"><div><h4 class="title">
-<a name="specsymb"></a><span class="title"> Special symbols </span>
-</h4></div></div>
+<a name="specsymb"></a> Special symbols </h4></div></div>
<p>
DocBook also provides special means for entering
typographic symbols which can not be entered directly
@@ -1811,23 +1772,23 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2880593"></a>
+<a name="id2893767"></a>
<tt>&amp;amp;</tt> -- ampersend (&amp;)
</p></li>
<li><p>
-<a name="id2880612"></a>
+<a name="id2893786"></a>
<tt>&amp;lt;</tt> -- left angle bracket (&lt;)
</p></li>
<li><p>
-<a name="id2880631"></a>
+<a name="id2893805"></a>
<tt>&amp;copy;</tt> -- copyright sign (©)
</p></li>
<li><p>
-<a name="id2880650"></a>
+<a name="id2893824"></a>
<tt>&amp;mdash;</tt> -- long dash (--)
</p></li>
<li><p>
-<a name="id2880669"></a>
+<a name="id2893842"></a>
<tt>&amp;hellip;</tt> -- ellipsis (...)
</p></li>
</ul></div>
@@ -1843,27 +1804,23 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
</div>
<div class="sect1">
-<a name="conventions"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="conventions"></a><span class="title">GDP Documentation Conventions </span>
-</h2></div></div>
+<a name="conventions"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="conventions"></a>GDP Documentation Conventions </h2></div></div>
<div class="sect2">
<a name="conventionsalldocs"></a><div class="titlepage"><div><h3 class="title">
-<a name="conventionsalldocs"></a><span class="title">Conventions for All GDP Documentation</span>
-</h3></div></div>
+<a name="conventionsalldocs"></a>Conventions for All GDP Documentation</h3></div></div>
<div class="sect3">
<a name="xmlcomp"></a><div class="titlepage"><div><h4 class="title">
-<a name="xmlcomp"></a><span class="title"> XML compatibility </span>
-</h4></div></div>
+<a name="xmlcomp"></a> XML compatibility </h4></div></div>
<p>
All GNOME documentation should conform to XML syntax
requirements, which are stricter than SGML ones -- see
- <a href="#xml">the section called &#x201C;XML and SGML&#x201D;</a> for more informaion.
+ <a href="#xml" title="XML and SGML">the section called &#x201C;XML and SGML&#x201D;</a> for more informaion.
</p>
</div>
<div class="sect3">
<a name="authorsnames"></a><div class="titlepage"><div><h4 class="title">
-<a name="authorsnames"></a><span class="title"> Authors' names</span>
-</h4></div></div>
+<a name="authorsnames"></a> Authors' names</h4></div></div>
<p>
All GNOME documentation should contain the names of both the
application authors and documentation authors, as well as a
@@ -1875,12 +1832,10 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect2">
<a name="conventionsappdocs"></a><div class="titlepage"><div><h3 class="title">
-<a name="conventionsappdocs"></a><span class="title">Conventions for Application Documentation</span>
-</h3></div></div>
+<a name="conventionsappdocs"></a>Conventions for Application Documentation</h3></div></div>
<div class="sect3">
<a name="applicationversionid"></a><div class="titlepage"><div><h4 class="title">
-<a name="applicationversionid"></a><span class="title">Application Version Identification</span>
-</h4></div></div>
+<a name="applicationversionid"></a>Application Version Identification</h4></div></div>
<p>
Application documentation should identify the version of the
application for which the documentation is written:
@@ -1897,8 +1852,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="license"></a><div class="titlepage"><div><h4 class="title">
-<a name="license"></a><span class="title"> Copyright information </span>
-</h4></div></div>
+<a name="license"></a> Copyright information </h4></div></div>
<p> Application
documentation should contain a copyright notice, stating the
licensing terms. It is suggested that you use the GNU Free
@@ -1911,8 +1865,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="license2"></a><div class="titlepage"><div><h4 class="title">
-<a name="license2"></a><span class="title">Software license</span>
-</h4></div></div>
+<a name="license2"></a>Software license</h4></div></div>
<p>
All GNOME applications must contain information about the
license (for software, not for documentation), either in the
@@ -1921,8 +1874,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
<div class="sect3">
<a name="bugtraq"></a><div class="titlepage"><div><h4 class="title">
-<a name="bugtraq"></a><span class="title"> Bug reporting</span>
-</h4></div></div>
+<a name="bugtraq"></a> Bug reporting</h4></div></div>
<p>
Application documentation should give an address for
reporting bugs and for submitting comments about the
@@ -1932,9 +1884,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</div>
</div>
<div class="sect1">
-<a name="writingapplicationmanuals"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="writingapplicationmanuals"></a><span class="title">Writing Application and Applet Manuals</span>
-</h2></div></div>
+<a name="writingapplicationmanuals"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="writingapplicationmanuals"></a>Writing Application and Applet Manuals</h2></div></div>
<p>
Every GNOME application or applet should have a manual specific
to that particular application. This manual should be a complete
@@ -1945,7 +1896,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
each feature and preference option available.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881127">Documentation Availability</a></h3>
+<h3 class="title">
+<a name="id2894300"></a>Documentation Availability</h3>
<p>
Applications and applets should not rely on documentation
which is only available on the internet. All manuals and
@@ -1955,13 +1907,14 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</p>
</div>
<p> Application manuals should be based on the template in
- <a href="#template1">the section called &#x201C;Template 1: Application Manual&#x201D;</a>. Applet manuals should be based on
- the templates in <a href="#template2-1x">the section called &#x201C;Template 2: Applet Manual For GNOME 1.x&#x201D;</a> for GNOME
- versions 1.x and the templates in <a href="#template2-2x">the section called &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</a>
+ <a href="#template1" title="Template 1: Application Manual">the section called &#x201C;Template 1: Application Manual&#x201D;</a>. Applet manuals should be based on
+ the templates in <a href="#template2-1x" title="Template 2: Applet Manual For GNOME 1.x">the section called &#x201C;Template 2: Applet Manual For GNOME 1.x&#x201D;</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 &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</a>
for GNOME versions 2.x.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881168">Manuals For Large Applications</a></h3>
+<h3 class="title">
+<a name="id2894341"></a>Manuals For Large Applications</h3>
<p>
Manuals for very large applications, such as GNOME Workshop
components should be a <tt>&lt;book&gt;</tt> (and thus
@@ -1972,7 +1925,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</p>
</div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881283">Applet Manuals in GNOME 2.0</a></h3>
+<h3 class="title">
+<a name="id2894456"></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
@@ -1988,17 +1942,17 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
Application manuals should be made available by having a
&quot;Manual&quot; entry in the Help pull-down menu
at the top of the
- application, as described in <a href="#listingdocsinhelpmenu">the section called &#x201C;Listing Documents in the Help Menu&#x201D;</a>.
+ application, as described in <a href="#listingdocsinhelpmenu" title="Listing Documents in the Help Menu">the section called &#x201C;Listing Documents in the Help Menu&#x201D;</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: all">
-<a name="listingdocsinhelpmenu"></a><span class="title">Listing Documents in the Help Menu</span>
-</h2></div></div>
+<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="id2881401">Developer Information</a></h3>
+<h3 class="title">
+<a name="id2894574"></a>Developer Information</h3>
<p>
This section is for developers. Documentation authors
generally do not need to know this material.
@@ -2035,7 +1989,8 @@ function-reference.html Gnumeric function reference
placed in this directory too.
</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881544">Note</a></h3>
+<h3 class="title">
+<a name="id2894718"></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.
@@ -2067,11 +2022,11 @@ GnomeUIInfo helpmenu[] = {
</p>
</div>
<div class="sect1">
-<a name="applicationhelpbuttons"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="applicationhelpbuttons"></a><span class="title">Application Help Buttons</span>
-</h2></div></div>
+<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="id2881682">Developer Information</a></h3>
+<h3 class="title">
+<a name="id2894855"></a>Developer Information</h3>
<p>
This section is for developers. Documentation authors
generally do not need to know this material.
@@ -2103,7 +2058,8 @@ if (tmp) {
}
</pre>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881788">NOTE</a></h3>
+<h3 class="title">
+<a name="id2894961"></a>NOTE</h3>
<p>
The example above is in the C language, please refer to other
documentation or forums for other GNOME language bindings.
@@ -2111,13 +2067,11 @@ if (tmp) {
</div>
</div>
<div class="sect1">
-<a name="packagingappletdocs"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="packagingappletdocs"></a><span class="title">Packaging Applet Documentation</span>
-</h2></div></div>
+<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><span class="title">Applet Documentation Files</span>
-</h3></div></div>
+<a name="appletfiles"></a>Applet Documentation Files</h3></div></div>
<p>
In GNOME 2.0 each applet will have its own documentation
installed separately, and the GNOME 2.0 help
@@ -2158,10 +2112,10 @@ if (tmp) {
</div>
<div class="sect2">
<a name="appletmenu"></a><div class="titlepage"><div><h3 class="title">
-<a name="appletmenu"></a><span class="title">Adding Documentation to an Applet Menu</span>
-</h3></div></div>
+<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="id2882029">Developer Information</a></h3>
+<h3 class="title">
+<a name="id2895202"></a>Developer Information</h3>
<p>
This section is for developers. Documentation authors
generally do not need to know this material.
@@ -2190,7 +2144,7 @@ _(&quot;Manual&quot;), &amp;open_manual, NULL);
You will need to write a simple callback function to open the
help browser to the appropriate document. This is done using
the <tt>gnome_help_file_find_file</tt> function,
- as described in <a href="#applicationhelpbuttons">the section called &#x201C;Application Help Buttons&#x201D;</a>.
+ as described in <a href="#applicationhelpbuttons" title="Application Help Buttons">the section called &#x201C;Application Help Buttons&#x201D;</a>.
</p>
<p>
You will also want to add an About menu
@@ -2209,9 +2163,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
</div>
<div class="sect1">
-<a name="writingcontextsensitivehelp"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="writingcontextsensitivehelp"></a><span class="title">Writing Context Sensitive Help (coming in GNOME-2.0)</span>
-</h2></div></div>
+<a name="writingcontextsensitivehelp"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="writingcontextsensitivehelp"></a>Writing Context Sensitive Help (coming in GNOME-2.0)</h2></div></div>
<p>
Context sensitive help, also known as &quot;pop-up&quot; help, will allow
a user to obtain help information about specific buttons or
@@ -2248,10 +2201,9 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
</div>
<div class="sect1">
-<a name="referring"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="referring"></a><span class="title">Referring to Other GNOME Documentation (coming in
- GNOME-2.0)</span>
-</h2></div></div>
+<a name="referring"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="referring"></a>Referring to Other GNOME Documentation (coming in
+ GNOME-2.0)</h2></div></div>
<p>
In the GNOME 2.0 Help System, you will be able to create links
from one document to another. The exact mechanism for doing
@@ -2259,9 +2211,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
</div>
<div class="sect1">
-<a name="basics"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="basics"></a><span class="title">Basics of Documentation Style</span>
-</h2></div></div>
+<a name="basics"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="basics"></a>Basics of Documentation Style</h2></div></div>
<p>
Most people have never enjoyed reading a software manual, and
they probably never will. Many times, they'll read the
@@ -2286,8 +2237,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
<div class="sect2">
<a name="styleplanning"></a><div class="titlepage"><div><h3 class="title">
-<a name="styleplanning"></a><span class="title">Planning</span>
-</h3></div></div>
+<a name="styleplanning"></a>Planning</h3></div></div>
<p>
Begin documenting by learning how to use the application and
reading over any existing documentation. Pay attention to
@@ -2303,14 +2253,13 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="balance"></a><div class="titlepage"><div><h3 class="title">
-<a name="balance"></a><span class="title">Achieving a Balanced Style</span>
-</h3></div></div>
+<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="id2882549"></a>
+<a name="id2895722"></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,
@@ -2322,7 +2271,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
items that are more complex.
</p></li>
<li><p>
-<a name="id2882577"></a>
+<a name="id2895750"></a>
Be engaging and friendly, yet professional. Games
documents may be less formal than productivity
application documents (people don't
@@ -2333,7 +2282,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
allusions or puns.
</p></li>
<li><p>
-<a name="id2882616"></a>
+<a name="id2895789"></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.
@@ -2342,7 +2291,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
tabs, it's not usually necessary to have one for each.
</p></li>
<li><p>
-<a name="id2882640"></a>
+<a name="id2895813"></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
@@ -2356,8 +2305,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="stylestructure"></a><div class="titlepage"><div><h3 class="title">
-<a name="stylestructure"></a><span class="title">Structure</span>
-</h3></div></div>
+<a name="stylestructure"></a>Structure</h3></div></div>
<p>
In general, you won't have to worry too much about structure,
because the templates provide you with an excellent example.
@@ -2390,8 +2338,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="stylegrammar"></a><div class="titlepage"><div><h3 class="title">
-<a name="stylegrammar"></a><span class="title">Grammar and Spelling</span>
-</h3></div></div>
+<a name="stylegrammar"></a>Grammar and Spelling</h3></div></div>
<p>
Nobody expects you to be perfect; they just expect the
documentation for their software to be error-free. That means
@@ -2418,13 +2365,11 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
</div>
<div class="sect1">
-<a name="teamwork"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="teamwork"></a><span class="title">Teamwork</span>
-</h2></div></div>
+<a name="teamwork"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="teamwork"></a>Teamwork</h2></div></div>
<div class="sect2">
<a name="teamworkgdp"></a><div class="titlepage"><div><h3 class="title">
-<a name="teamworkgdp"></a><span class="title">Working With The GDP Team</span>
-</h3></div></div>
+<a name="teamworkgdp"></a>Working With The GDP Team</h3></div></div>
<p>
The GDP team is a valuable resource for any documentation
author. GDP members can answer most questions documentation
@@ -2451,8 +2396,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="teamworkdevelopers"></a><div class="titlepage"><div><h3 class="title">
-<a name="teamworkdevelopers"></a><span class="title">Working With Developers</span>
-</h3></div></div>
+<a name="teamworkdevelopers"></a>Working With Developers</h3></div></div>
<p>
Writing documentation typically involves a certain amount of
interaction with the developers of GNOME or the application
@@ -2467,13 +2411,11 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
</div>
<div class="sect1">
-<a name="finishing"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="finishing"></a><span class="title">Finishing A Document</span>
-</h2></div></div>
+<a name="finishing"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="finishing"></a>Finishing A Document</h2></div></div>
<div class="sect2">
<a name="editting"></a><div class="titlepage"><div><h3 class="title">
-<a name="editting"></a><span class="title">Editing The Document</span>
-</h3></div></div>
+<a name="editting"></a>Editing The Document</h3></div></div>
<p>
When the document is finished, the document should be edited
by another member of the GDP for spelling, clarity, and
@@ -2483,8 +2425,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="submitting"></a><div class="titlepage"><div><h3 class="title">
-<a name="submitting"></a><span class="title">Submitting The Document</span>
-</h3></div></div>
+<a name="submitting"></a>Submitting The Document</h3></div></div>
<p>
After the document has been edited and checked for technical
accuracy, it is ready to be combined with the application or
@@ -2507,13 +2448,11 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
</div>
<div class="sect1">
-<a name="resources"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="resources"></a><span class="title">Resources</span>
-</h2></div></div>
+<a name="resources"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="resources"></a>Resources</h2></div></div>
<div class="sect2">
<a name="resourcesweb"></a><div class="titlepage"><div><h3 class="title">
-<a name="resourcesweb"></a><span class="title">Resources On The Web</span>
-</h3></div></div>
+<a name="resourcesweb"></a>Resources On The Web</h3></div></div>
<p> The <a href="http://developer.gnome.org/projects/gdp/" target="_top">GNOME
Documentation Project Web page</a> lists current GDP
projects and members.
@@ -2530,8 +2469,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="resourcesbooks"></a><div class="titlepage"><div><h3 class="title">
-<a name="resourcesbooks"></a><span class="title">Books</span>
-</h3></div></div>
+<a name="resourcesbooks"></a>Books</h3></div></div>
<p>
Docbook: The Definitive Guide is available in both printed
form and on the web at:
@@ -2542,8 +2480,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="mailinglists"></a><div class="titlepage"><div><h3 class="title">
-<a name="mailinglists"></a><span class="title">Mailing Lists</span>
-</h3></div></div>
+<a name="mailinglists"></a>Mailing Lists</h3></div></div>
<p>
The <i>gnome-docs-list</i> mailing list is the
main discussion area for all contributors to the GNOME
@@ -2554,8 +2491,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</div>
<div class="sect2">
<a name="irc"></a><div class="titlepage"><div><h3 class="title">
-<a name="irc"></a><span class="title">IRC</span>
-</h3></div></div>
+<a name="irc"></a>IRC</h3></div></div>
<p>
Internet Relay Chat (IRC) is a fast and easy way to get in
touch with other GDP members. There are generally at least a
@@ -2565,13 +2501,12 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
</div>
</div>
-<div id="templates" class="appendix">
-<h2 class="title" style="clear: all">
-<a name="templates"></a>Appendix A. Document Templates</h2>
+<div class="appendix">
+<h2 class="title" style="clear: both">
+<a name="templates"></a>A. Document Templates</h2>
<div class="sect1">
-<a name="template1"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="template1"></a><span class="title">Template 1: Application Manual</span>
-</h2></div></div>
+<a name="template1"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="template1"></a>Template 1: Application Manual</h2></div></div>
<p>
The following template should be used for all application
manuals. You can always get the latest copy of this
@@ -3311,9 +3246,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
</div>
<div class="sect1">
-<a name="template2-1x"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="template2-1x"></a><span class="title">Template 2: Applet Manual For GNOME 1.x</span>
-</h2></div></div>
+<a name="template2-1x"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="template2-1x"></a>Template 2: Applet Manual For GNOME 1.x</h2></div></div>
<p>
The following templates should be used for all applet
manuals in GNOME 1.x releases. You can always get the latest
@@ -3639,9 +3573,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p>
</div>
<div class="sect1">
-<a name="template2-2x"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="template2-2x"></a><span class="title">Template 2: Applet Manual For GNOME 2.x</span>
-</h2></div></div>
+<a name="template2-2x"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="template2-2x"></a>Template 2: Applet Manual For GNOME 2.x</h2></div></div>
<p>
The following templates should be used for all applet
manuals in GNOME 2.x releases. You can always get the latest
diff --git a/tests/docbook/result/html/graphics.html b/tests/docbook/result/html/graphics.html
index 751e21b1..c601d569 100644
--- a/tests/docbook/result/html/graphics.html
+++ b/tests/docbook/result/html/graphics.html
@@ -3,29 +3,28 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Graphics Test Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2760559" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2760559"></a>Graphics Test Document Title</h1></div>
+<div><h2 class="title">
+<a name="id2767233"></a>Graphics Test Document Title</h2></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2760568">Graphic</a>
+<dt> <a href="#id2767242">Graphic</a>
</dt>
-<dt> <a href="#id2760686">Inlinegraphic</a>
+<dt> <a href="#id2767364">Inlinegraphic</a>
</dt>
-<dt> <a href="#id2760766">MediaObject</a>
+<dt> <a href="#id2767444">MediaObject</a>
</dt>
</dl>
</div>
<div class="section">
-<a name="id2760568"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2760568"></a><span class="title">Graphic</span>
-</h2></div></div>
+<a name="id2767242"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767242"></a>Graphic</h2></div></div>
<p>fileref:</p>
<p><img src="emc2.png"></p>
<p>entityref:</p>
@@ -36,9 +35,8 @@
<p><img src="emc2.png" height="20" width="20"></p>
</div>
<div class="section">
-<a name="id2760686"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2760686"></a><span class="title">Inlinegraphic</span>
-</h2></div></div>
+<a name="id2767364"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767364"></a>Inlinegraphic</h2></div></div>
<p>fileref: <img src="emc2.png">
</p>
<p>entityref: <img src="">
@@ -47,9 +45,8 @@
</p>
</div>
<div class="section">
-<a name="id2760766"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2760766"></a><span class="title">MediaObject</span>
-</h2></div></div>
+<a name="id2767444"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767444"></a>MediaObject</h2></div></div>
<p>fileref:</p>
<div class="mediaobject"><img src="emc2.png"></div>
<p>entityref:</p>
diff --git a/tests/docbook/result/html/gtest.html b/tests/docbook/result/html/gtest.html
index 528713a5..5e4518d9 100644
--- a/tests/docbook/result/html/gtest.html
+++ b/tests/docbook/result/html/gtest.html
@@ -3,11 +3,11 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Chapter 1. Graphics Test</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2750960" class="chapter">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2750960"></a>Chapter 1. Graphics Test</h2></div></div>
+<a name="id2770465"></a>Chapter 1. Graphics Test</h2></div></div>
<p>A graphic by fileref:</p>
<div class="mediaobject"><img src="emc2.gif"></div>
<p>A graphic by entityref:</p>
diff --git a/tests/docbook/result/html/idxbook.html b/tests/docbook/result/html/idxbook.html
index 13955529..63290704 100644
--- a/tests/docbook/result/html/idxbook.html
+++ b/tests/docbook/result/html/idxbook.html
@@ -3,12 +3,12 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Test Index Document Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751413">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2767234">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2751413"></a>Book Test Index Document Title</h1></div>
+<a name="id2767234"></a>Bookinfo Test Index Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
<hr>
@@ -16,165 +16,83 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2757694">Foreword</a>
+<dt> <a href="#id2767417">Foreword</a>
</dt>
-<dt>1. <a href="#chapter">First Chapter</a>
+<dt>1 <a href="#chapter">First Chapter</a>
</dt>
-<dd><dl><dt> <a href="#id2753860">First Sect1</a>
+<dd><dl><dt> <a href="#id2767082">First Sect1</a>
</dt></dl></dd>
-<dt>2. <a href="#ch2">Second Chapter</a>
+<dt>2 <a href="#ch2">Second Chapter</a>
</dt>
-<dt>A. <a href="#id2755907">First Appendix</a>
+<dt>A <a href="#id2769249">First Appendix</a>
</dt>
-<dt><a href="#id2754174">Index</a></dt>
+<dt><a href="#id2770749">Index</a></dt>
</dl>
</div>
-<div id="id2757694" class="preface">
+<div id="id2767417" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2757694"></a>Foreword</h2></div></div>
-<p>This is a test paragraph<a class="indexterm" name="id2757712"></a>.</p>
+<a name="id2767417"></a>Foreword</h2></div></div>
+<p>This is a test paragraph<a class="indexterm" name="id2767434"></a>.</p>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. First Chapter</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt> <a href="#id2753860">First Sect1</a>
+<dl><dt> <a href="#id2767082">First Sect1</a>
</dt></dl>
</div>
-<p>Paragraph<a class="indexterm" name="id2753846"></a>.</p>
+<p>Paragraph<a class="indexterm" name="id2767067"></a>.</p>
<div class="sect1">
-<a name="id2753860"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753860"></a><span class="title">First Sect1</span>
-</h2></div></div>
-<p>Another paragraph<a class="indexterm" name="id2757735"></a>.</p>
+<a name="id2767082"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767082"></a>First Sect1</h2></div></div>
+<p>Another paragraph<a class="indexterm" name="id2767464"></a>.</p>
</div>
</div>
-<div id="ch2" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ch2"></a>Chapter 2. Second Chapter</h2></div></div>
<p>This is a test paragraph.
-<a class="indexterm" name="id2874805"></a>
-<a class="indexterm" name="id2874831"></a>
-<a class="indexterm" name="id2874809"></a>
+<a class="indexterm" name="id2887976"></a>
+<a class="indexterm" name="id2888003"></a>
+<a class="indexterm" name="id2887985"></a>
-<a class="indexterm" name="id2848575"></a>
-<a class="indexterm" name="id2848598"></a>
+<a class="indexterm" name="id2861744"></a>
+<a class="indexterm" name="id2861768"></a>
-<a class="indexterm" name="id2848614"></a>
+<a class="indexterm" name="id2861784"></a>
-<a class="indexterm" name="id2755797"></a>
-<a class="indexterm" name="id2755813"></a>
+<a class="indexterm" name="id2769139"></a>
+<a class="indexterm" name="id2769155"></a>
-<a class="indexterm" name="id2755844"></a>
-<a class="indexterm" name="id2755867"></a>
-<a class="indexterm" name="id2755891"></a>
+<a class="indexterm" name="id2769186"></a>
+<a class="indexterm" name="id2769209"></a>
+<a class="indexterm" name="id2769233"></a>
</p>
</div>
-<div id="id2755907" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755907"></a>Appendix A. First Appendix</h2></div></div>
+<a name="id2769249"></a>Appendix A. First Appendix</h2></div></div>
<p>This is just a test.
-<a class="indexterm" name="id2755925"></a>
-<a class="indexterm" name="id2755941"></a>
+<a class="indexterm" name="id2769267"></a>
+<a class="indexterm" name="id2769283"></a>
-<a class="indexterm" name="id2755957"></a>
-<a class="indexterm" name="id2755980"></a>
+<a class="indexterm" name="id2769298"></a>
+<a class="indexterm" name="id2769322"></a>
-<a class="indexterm" name="id2755996"></a>
-<a class="indexterm" name="id2756027"></a>
+<a class="indexterm" name="id2769338"></a>
+<a class="indexterm" name="id2769369"></a>
-<a class="indexterm" name="id2756043"></a>
-<a class="indexterm" name="id2756067"></a>
-<a class="indexterm" name="id2756090"></a>
+<a class="indexterm" name="id2769385"></a>
+<a class="indexterm" name="id2769408"></a>
+<a class="indexterm" name="id2769432"></a>
-<a class="indexterm" name="id2754115"></a>
-<a class="indexterm" name="id2754131"></a>
-<a class="indexterm" name="id2754147"></a>
+<a class="indexterm" name="id2770691"></a>
+<a class="indexterm" name="id2770707"></a>
+<a class="indexterm" name="id2770723"></a>
</p>
</div>
-<div class="index">
-<h2 class="title"><a name="id2754174">Index</a></h2>
-<div class="index">
-<div class="indexdiv">
-<h3>Symbols</h3>
-<dl>
-<dt>1 digit test, <a href="#id2755907">First Appendix</a>
-</dt>
-<dt>2 digit test, <a href="#id2755907">First Appendix</a>
-</dt>
-<dt>[square bracket test], <a href="#id2755907">First Appendix</a>
-</dt>
-</dl>
-</div>
-<div class="indexdiv">
-<h3>A</h3>
-<dl>
-<dt>the ap1, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-<dd><dl><dt>see also ap2</dt></dl></dd>
-<dt>ap2, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-</dl>
-</div>
-<div class="indexdiv">
-<h3>B</h3>
-<dl>
-<dt>bp1</dt>
-<dd><dl><dt>bp1bs1, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt></dl></dd>
-<dt>bp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-</dl>
-</div>
-<div class="indexdiv">
-<h3>C</h3>
-<dl>
-<dt>chapter zone, <a href="#chapter">First Chapter</a>, <a href="#ch2">Second Chapter</a>
-</dt>
-<dt>cp1</dt>
-<dd><dl>
-<dt>cp1cs1</dt>
-<dd><dl><dt>cp1cs1ct1, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt></dl></dd>
-</dl></dd>
-<dt>cp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-<dt>cp2see</dt>
-<dd><dl>
-<dt>cp2seesec</dt>
-<dd><dl><dt>cp2</dt></dl></dd>
-</dl></dd>
-</dl>
-</div>
-<div class="indexdiv">
-<h3>D</h3>
-<dl>
-<dt>dp1</dt>
-<dd><dl>
-<dt>dp1ds1, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-<dt>dp1ds2, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-</dl></dd>
-<dt>dp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755907">First Appendix</a>
-</dt>
-</dl>
-</div>
-<div class="indexdiv">
-<h3>P</h3>
-<dl>
-<dt>paragraph, <a href="#chapter">First Chapter</a>
-</dt>
-<dd><dl>
-<dt>another, <a href="#id2753860">First Sect1</a>
-</dt>
-<dt>test, <a href="#id2757694">Foreword</a>
-</dt>
-</dl></dd>
-</dl>
-</div>
-</div>
-</div>
+<div id="id2770749" class="index"><div class="titlepage"><div><h2 class="title">
+<a name="id2770749"></a>Index</h2></div></div></div>
</div></body>
</html>
diff --git a/tests/docbook/result/html/kwrite.html b/tests/docbook/result/html/kwrite.html
index c72ad108..1c01c7b8 100644
--- a/tests/docbook/result/html/kwrite.html
+++ b/tests/docbook/result/html/kwrite.html
@@ -3,29 +3,29 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>the kwrite handbook</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
<meta name="keywords" content="kde, kwrite, text, editor">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599532">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2861745">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2599532"></a>the kwrite handbook</h1></div>
+<a name="id2861745"></a>the kwrite handbook</h1></div>
<div>
<h3 class="author">thad mcginnis</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></div></div>
<h3 class="othercredit">jochen wilhelmy</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></div></div>
<h3 class="othercredit">glen parker</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></div></div>
<h3 class="othercredit">michael koch</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></div></div>
<h3 class="othercredit">christian tibirna</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></div></div>
<h3 class="othercredit">lauri watts</h3>
-<div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></pre></div>
+<div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></div></div>
</div>
-<div><span class="releaseinfo">2.00.00<br></span></div>
-<div><p class="copyright">Copyright © 2000, 2001 by thad mcginnis</p></div>
+<div><p class="releaseinfo">2.00.00</p></div>
+<div><p class="copyright">Copyright © 2000, 2001 thad mcginnis</p></div>
<div><div class="legalnotice"><p>permission is granted to copy, distribute and/or modify this
document under the terms of the gnu free documentation license,
version 1.1 or any later version published by the free software
@@ -33,7 +33,7 @@ foundation; with no invariant sections, with no front-cover texts, and
with no back-cover texts. a copy of the license is included in <a href="#gnu-fdl">the section entitled gnu free documentation license</a>.</p></div></div>
<div><div class="abstract">
<p>
-<a name="id2756138"></a><b>Abstract</b>
+<a name="id2770854"></a><b>Abstract</b>
</p>
<p>this handbook describes kwrite version 2.0</p>
<p>kwrite is a text editor for kde 2.0</p>
@@ -43,9 +43,9 @@ with no back-cover texts. a copy of the license is included in <a href="#gnu-fd
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#introduction">introduction</a>
+<dt>1 <a href="#introduction">introduction</a>
</dt>
-<dt>2. <a href="#on-screen-fundamentals">some fundamentals</a>
+<dt>2 <a href="#on-screen-fundamentals">some fundamentals</a>
</dt>
<dd><dl>
<dt> <a href="#drag-and-drop">drag and drop</a>
@@ -63,7 +63,7 @@ with no back-cover texts. a copy of the license is included in <a href="#gnu-fd
<dt> <a href="#keybindings">key bindings</a>
</dt>
</dl></dd>
-<dt>3. <a href="#the-menu-entries">the menu entries</a>
+<dt>3 <a href="#the-menu-entries">the menu entries</a>
</dt>
<dd><dl>
<dt> <a href="#file">the file menu</a>
@@ -79,7 +79,7 @@ with no back-cover texts. a copy of the license is included in <a href="#gnu-fd
<dt> <a href="#help">the help menu</a>
</dt>
</dl></dd>
-<dt>4. <a href="#pref-dialog">configure kwrite</a>
+<dt>4 <a href="#pref-dialog">configure kwrite</a>
</dt>
<dd><dl>
<dt> <a href="#prefcolors">colors</a>
@@ -93,15 +93,15 @@ with no back-cover texts. a copy of the license is included in <a href="#gnu-fd
<dt> <a href="#prefspellchecker">spelling</a>
</dt>
</dl></dd>
-<dt>5. <a href="#pref-highlighting">highlighting</a>
+<dt>5 <a href="#pref-highlighting">highlighting</a>
</dt>
-<dt>6. <a href="#credits">credits and licenses</a>
+<dt>6 <a href="#credits">credits and licenses</a>
</dt>
-<dt>A. <a href="#installation">installation</a>
+<dt>A <a href="#installation">installation</a>
</dt>
</dl>
</div>
-<div id="introduction" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="introduction"></a>Chapter 1. introduction</h2></div></div>
<p>kwrite is more than a text editor for the kde desktop. it is meant
@@ -110,10 +110,10 @@ alternative to more powerful editors. it may be best used in conjunction
with konqueror for source file browsing for
different languages. kwrite also works very well as a simple text editor.
one of kwrite's main features is the colorized syntax, customized for
-many different programming languages such as: c/c++, java, python, perl,
+many different programming languages such as: c/c++, java&#x2122;, python, perl,
bash, modula 2, html, and ada.</p>
</div>
-<div id="on-screen-fundamentals" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="on-screen-fundamentals"></a>Chapter 2. some fundamentals</h2></div></div>
<div class="toc">
@@ -138,99 +138,88 @@ bash, modula 2, html, and ada.</p>
<p>kwrite is very simple to use. anyone that has used a text editor should
have no problems. </p>
<div class="sect1">
-<a name="drag-and-drop"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="drag-and-drop"></a><span class="title">drag and drop</span>
-</h2></div></div>
+<a name="drag-and-drop"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="drag-and-drop"></a>drag and drop</h2></div></div>
<p>kwrite uses the kde drag and drop protocol. files may be dragged
and dropped onto kwrite from the desktop,
konqueror or some remote ftp site opened in one
of konqueror's windows. </p>
</div>
<div class="sect1">
-<a name="command-line-options"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="command-line-options"></a><span class="title">command line options</span>
-</h2></div></div>
+<a name="command-line-options"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="command-line-options"></a>command line options</h2></div></div>
<p>though kwrite may most often be started from the kde program menu,
or a desktop icon, it can also be opened at the command line prompt of a
terminal window. there are a few useful options that are available when
doing this.</p>
<div class="sect2">
<a name="specify-a-file"></a><div class="titlepage"><div><h3 class="title">
-<a name="specify-a-file"></a><span class="title">specify a file</span>
-</h3></div></div>
+<a name="specify-a-file"></a>specify a file</h3></div></div>
<p>by specifying the path and name of a particular file the user can
have kwrite open (or create) that file immediately upon startup. this
option might look something like the following:</p>
-<div class="informalexample" id="id2757865">
-<p>
-<a name="id2757865"></a><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>/home/myhome/docs/myfile.txt</tt></i></tt></tt></b></pre>
-<p>
+<div class="informalexample" id="id2767505">
+<a name="id2767505"></a><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>/home/myhome/docs/myfile.txt</tt></i></tt></tt></b></pre>
</div>
</div>
<div class="sect2">
<a name="editing-files-on-the-internet"></a><div class="titlepage"><div><h3 class="title">
-<a name="editing-files-on-the-internet"></a><span class="title">specify a file on the internet</span>
-</h3></div></div>
+<a name="editing-files-on-the-internet"></a>specify a file on the internet</h3></div></div>
<p>the above-mentioned method could even be used to open files on the
internet (if the user has an active connection at the time.) an example of
this might look like the following:</p>
-<div class="informalexample" id="id2757952">
-<p>
-<a name="id2757952"></a><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>ftp://ftp.kde.org/pub/kde/welcome.msg</tt></i></tt></tt></b></pre>
-<p>
+<div class="informalexample" id="id2767586">
+<a name="id2767586"></a><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>ftp://ftp.kde.org/pub/kde/welcome.msg</tt></i></tt></tt></b></pre>
</div>
</div>
<div class="sect2">
<a name="other-command-line-options"></a><div class="titlepage"><div><h3 class="title">
-<a name="other-command-line-options"></a><span class="title">other command line options</span>
-</h3></div></div>
+<a name="other-command-line-options"></a>other command line options</h3></div></div>
<p>the following command line help options are available</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2758042"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help</tt></tt></b></span>
+<a name="id2767676"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2758069"></a>this lists the most basic options available at the command
+<a name="id2767703"></a>this lists the most basic options available at the command
line.</p></dd>
<dt>
-<a name="id2758085"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-qt</tt></tt></b></span>
+<a name="id2767719"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-qt</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2848680"></a>this lists the options available for changing the way
-kwrite interacts with qt.</p></dd>
+<a name="id2767746"></a>this lists the options available for changing the way
+kwrite interacts with qt&#x2122;.</p></dd>
<dt>
-<a name="id2756217"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-kde</tt></tt></b></span>
+<a name="id2767780"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-kde</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2754204"></a>this lists the options available for changing the way
+<a name="id2767807"></a>this lists the options available for changing the way
kwrite interacts with kde.</p></dd>
<dt>
-<a name="id2756254"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-all</tt></tt></b></span>
+<a name="id2767833"></a><span class="term"><b><tt><b>kwrite</b> <tt>--help-all</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2756282"></a>this lists all of the command line options.</p></dd>
+<a name="id2767860"></a>this lists all of the command line options.</p></dd>
<dt>
-<a name="id2756299"></a><span class="term"><b><tt><b>kwrite</b> <tt>--author</tt></tt></b></span>
+<a name="id2767878"></a><span class="term"><b><tt><b>kwrite</b> <tt>--author</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2752556"></a>lists kwrite's authors in the terminal window</p></dd>
+<a name="id2767905"></a>lists kwrite's authors in the terminal window</p></dd>
<dt>
-<a name="id2752581"></a><span class="term"><b><tt><b>kwrite</b> <tt>--version</tt></tt></b></span>
+<a name="id2767930"></a><span class="term"><b><tt><b>kwrite</b> <tt>--version</tt></tt></b></span>
</dt>
<dd><p>
-<a name="id2752608"></a>lists version information for qt, kde, and kwrite. also available through <b><tt><b>kwrite</b> <tt>-v</tt></tt></b> </p></dd>
+<a name="id2767958"></a>lists version information for qt&#x2122;, kde, and kwrite. also available through <b><tt><b>kwrite</b> <tt>-v</tt></tt></b> </p></dd>
</dl></div>
</div>
</div>
<div class="sect1">
-<a name="keybindings"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="keybindings"></a><span class="title">key bindings</span>
-</h2></div></div>
-<p>many of the key bindings (shortcuts) are configurable by way of the <a href="#settings">settings</a> menu. by default kwrite honors the
+<a name="keybindings"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="keybindings"></a>key bindings</h2></div></div>
+<p>many of the key bindings (shortcuts) are configurable by way of the <a href="#settings" title="the settings menu">settings</a> menu. by default kwrite honors the
following key bindings.</p>
-<div class="informaltable" id="id2752734">
-<p>
-<a name="id2752734"></a><table border="1">
+<div class="informaltable" id="id2765794">
+<a name="id2765794"></a><table border="1">
<colgroup>
<col>
<col>
@@ -356,11 +345,10 @@ text)</p></td>
</tr>
</tbody>
</table>
-<p>
</div>
</div>
</div>
-<div id="the-menu-entries" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="the-menu-entries"></a>Chapter 3. the menu entries</h2></div></div>
<div class="toc">
@@ -381,22 +369,21 @@ text)</p></td>
</dl>
</div>
<div class="sect1">
-<a name="file"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="file"></a><span class="title">the file menu</span>
-</h2></div></div>
+<a name="file"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="file"></a>the file menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2875491"></a><span class="term"><a name="new"></a>file-&gt;new (<b>ctrl-n</b>)</span>
+<a name="id2888668"></a><span class="term"><a name="new"></a>file-&gt;new (<b>ctrl-n</b>)</span>
</dt>
<dd><p>
-<a name="id2875576"></a>this starts a new document in the editor. if there is a current
+<a name="id2888752"></a>this starts a new document in the editor. if there is a current
document with unsaved changes the user is given a chance to save it.</p></dd>
<dt>
-<a name="id2875596"></a><span class="term"><a name="open"></a>file-&gt;0pen (<b>ctrl-o</b>)</span>
+<a name="id2888773"></a><span class="term"><a name="open"></a>file-&gt;0pen (<b>ctrl-o</b>)</span>
</dt>
<dd>
<p>
-<a name="id2875681"></a>this command opens a file. it does this by means of a dialog box
+<a name="id2888858"></a>this command opens a file. it does this by means of a dialog box
which allows the user to navigate the file system. the dialog operates
like a small file manager. clicking on directories displayed in the
central window directs the dialog to enter that directory - displaying its
@@ -422,78 +409,77 @@ directory, and finally there is dropdown box with a list of some commonly
frequented directories.</p>
</dd>
<dt>
-<a name="id2875751"></a><span class="term"><a name="open-recent"></a>file-&gt;open
+<a name="id2888928"></a><span class="term"><a name="open-recent"></a>file-&gt;open
recent</span>
</dt>
<dd><p>
-<a name="id2875808"></a>this is a shortcut to open recently saved documents. clicking on
+<a name="id2888984"></a>this is a shortcut to open recently saved documents. clicking on
this item opens a list to the side of the menu with several of the most recently
saved files. clicking on a specific file will open it in kwrite - if the file
still resides at the same location. </p></dd>
<dt>
-<a name="id2875838"></a><span class="term"><a name="save"></a>file-&gt;save (<b>ctrl-s</b>)</span>
+<a name="id2889014"></a><span class="term"><a name="save"></a>file-&gt;save (<b>ctrl-s</b>)</span>
</dt>
<dd><p>
-<a name="id2875923"></a>this saves the current document. if there has already been a
+<a name="id2889099"></a>this saves the current document. if there has already been a
save of the document then this will overwrite the previously saved file without
asking for the user's consent. if it is the first save of a new document the
save as dialog (described below) will be invoked.</p></dd>
<dt>
-<a name="id2875946"></a><span class="term"><a name="save-as"></a>file-&gt;save
+<a name="id2889122"></a><span class="term"><a name="save-as"></a>file-&gt;save
as</span>
</dt>
<dd><p>
-<a name="id2876002"></a>this allows a document to be saved with a new file name. this is
+<a name="id2889179"></a>this allows a document to be saved with a new file name. this is
done by means of the file dialog box described above in the <a href="#open">open</a> section of this help file.</p></dd>
<dt>
-<a name="id2876042"></a><span class="term"><a name="print"></a>file-&gt;print (<b>ctrl-p</b>)</span>
+<a name="id2889219"></a><span class="term"><a name="print"></a>file-&gt;print (<b>ctrl-p</b>)</span>
</dt>
<dd><p>
-<a name="id2876128"></a>opens a simple print dialog allowing the user to specify what, where, and how to print</p></dd>
+<a name="id2889304"></a>opens a simple print dialog allowing the user to specify what, where, and how to print</p></dd>
<dt>
-<a name="id2876147"></a><span class="term"><a name="new-window"></a>file-&gt;new window</span>
+<a name="id2889323"></a><span class="term"><a name="new-window"></a>file-&gt;new window</span>
</dt>
<dd><p>
-<a name="id2876203"></a>this creates a new window, i.e. a new instance of kwrite. in this way the user can easily work
+<a name="id2889380"></a>this creates a new window, i.e. a new instance of kwrite. in this way the user can easily work
on more than one file at a time with kwrite.</p></dd>
<dt>
-<a name="id2876246"></a><span class="term"><a name="new-view"></a>file-&gt;new view</span>
+<a name="id2889423"></a><span class="term"><a name="new-view"></a>file-&gt;new view</span>
</dt>
<dd><p>
-<a name="id2876303"></a>this creates a new view of the current document, i.e., a new instance of
+<a name="id2889479"></a>this creates a new view of the current document, i.e., a new instance of
kwrite (as explained in the previous entry) but containing the same
document.</p></dd>
<dt>
-<a name="id2876338"></a><span class="term"><a name="close"></a>file-&gt;quit (<b>ctrl-q</b>)</span>
+<a name="id2889515"></a><span class="term"><a name="close"></a>file-&gt;quit (<b>ctrl-q</b>)</span>
</dt>
<dd><p>
-<a name="id2876424"></a>this will close the editor window, if you have more than one
+<a name="id2889600"></a>this will close the editor window, if you have more than one
instance of kwrite running, through the new view or
new window menu items, those instances will not be
closed.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="edit"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="edit"></a><span class="title">the edit menu</span>
-</h2></div></div>
+<a name="edit"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="edit"></a>the edit menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2876508"></a><span class="term"><a name="undo"></a>edit-&gt;undo (<b>ctrl-z</b>)</span>
+<a name="id2889685"></a><span class="term"><a name="undo"></a>edit-&gt;undo (<b>ctrl-z</b>)</span>
</dt>
<dd><p>
-<a name="id2876594"></a>this is used to eliminate or reverse the most recent user action or operation. just what
+<a name="id2889770"></a>this is used to eliminate or reverse the most recent user action or operation. just what
constitutes such an action may be better understood by referring to the <a href="#group-undos">group undos</a> portion of this help file.</p></dd>
<dt>
-<a name="id2876635"></a><span class="term"><a name="redo"></a>edit-&gt;redo (<b>ctrl-shift-z</b>)</span>
+<a name="id2889811"></a><span class="term"><a name="redo"></a>edit-&gt;redo (<b>ctrl-shift-z</b>)</span>
</dt>
<dd><p>
-<a name="id2876730"></a>this will reverse the most recent change (if any) made using undo</p></dd>
+<a name="id2889907"></a>this will reverse the most recent change (if any) made using undo</p></dd>
<dt>
-<a name="id2876749"></a><span class="term"><a name="undohistory"></a>edit-&gt;undo/redo history</span>
+<a name="id2889926"></a><span class="term"><a name="undohistory"></a>edit-&gt;undo/redo history</span>
</dt>
<dd><p>
-<a name="id2876806"></a>this will call a display box showing a list of the most recent actions on
+<a name="id2889982"></a>this will call a display box showing a list of the most recent actions on
the left and another list of actions which have been 'undone' on the right.
there are also three buttons at the right of the box labeled
undo, redo, and
@@ -509,43 +495,43 @@ useful when the user knows precisely the point to which she or he would like to
proceed - making it unnecessary to go through a series of single undo or redo
actions.</p></dd>
<dt>
-<a name="id2876890"></a><span class="term"><a name="cut"></a>edit-&gt;cut (<b>ctrl-x</b>)</span>
+<a name="id2890067"></a><span class="term"><a name="cut"></a>edit-&gt;cut (<b>ctrl-x</b>)</span>
</dt>
<dd><p>
-<a name="id2876977"></a>this command deletes the current selection and places it on the clipboard. the
+<a name="id2890154"></a>this command deletes the current selection and places it on the clipboard. the
clipboard is a feature of kde that works invisibly to provide a way to transfer data between
applications.</p></dd>
<dt>
-<a name="id2876998"></a><span class="term"><a name="copy"></a>edit-&gt;copy (<b>ctrl-c</b>)</span>
+<a name="id2890175"></a><span class="term"><a name="copy"></a>edit-&gt;copy (<b>ctrl-c</b>)</span>
</dt>
<dd><p>
-<a name="id2877084"></a>this copies the currently selected text to the clipboard so that it may be
+<a name="id2890260"></a>this copies the currently selected text to the clipboard so that it may be
pasted elsewhere. the clipboard is a feature of kde that works invisibly to
provide a way to transfer data between applications.</p></dd>
<dt>
-<a name="id2877105"></a><span class="term"><a name="paste"></a>edit-&gt;paste (<b>ctrl-v</b>)</span>
+<a name="id2890282"></a><span class="term"><a name="paste"></a>edit-&gt;paste (<b>ctrl-v</b>)</span>
</dt>
<dd><p>
-<a name="id2877190"></a>this will insert the contents of the clipboard at the cursor position. the
+<a name="id2890367"></a>this will insert the contents of the clipboard at the cursor position. the
clipboard is feature of kde that works invisibly to provide a way to transfer
data between applications.</p></dd>
<dt>
-<a name="id2877212"></a><span class="term"><a name="select-all"></a>edit-&gt;select all (<b>ctrl-a</b>)</span>
+<a name="id2890388"></a><span class="term"><a name="select-all"></a>edit-&gt;select all (<b>ctrl-a</b>)</span>
</dt>
<dd><p>
-<a name="id2877299"></a>this will select the entire document. this could be very useful for
+<a name="id2890476"></a>this will select the entire document. this could be very useful for
copying the entire file to another application.</p></dd>
<dt>
-<a name="id2877319"></a><span class="term"><a name="invert-the-selection"></a>edit-&gt;invert selection</span>
+<a name="id2890496"></a><span class="term"><a name="invert-the-selection"></a>edit-&gt;invert selection</span>
</dt>
<dd><p>
-<a name="id2877377"></a>this selects any unselected text while unselecting any selected text -
+<a name="id2890554"></a>this selects any unselected text while unselecting any selected text -
effectively reversing the current state of selection.</p></dd>
<dt>
-<a name="id2877397"></a><span class="term"><a name="find"></a>edit-&gt;find (<b>ctrl-f</b>)</span>
+<a name="id2890574"></a><span class="term"><a name="find"></a>edit-&gt;find (<b>ctrl-f</b>)</span>
</dt>
<dd><p>
-<a name="id2877482"></a>this opens the find dialog which is used to specify the text to
+<a name="id2890659"></a>this opens the find dialog which is used to specify the text to
find in the document. there is small text box for entering the search
pattern which also doubles as a dropdown box. clicking on the dropdown arrow at
the side of the box makes available other recent search patterns. other
@@ -560,16 +546,16 @@ searched for pattern. the search from cursor option begins
the search from the current position of the cursor within the document rather
than from the beginning.</p></dd>
<dt>
-<a name="id2877563"></a><span class="term"><a name="find-again"></a>edit-&gt;find next (<b>f3</b>)</span>
+<a name="id2890739"></a><span class="term"><a name="find-again"></a>edit-&gt;find next (<b>f3</b>)</span>
</dt>
<dd><p>
-<a name="id2877643"></a>this repeats the last find operation, if any, without calling the find
+<a name="id2890819"></a>this repeats the last find operation, if any, without calling the find
dialog box.</p></dd>
<dt>
-<a name="id2877662"></a><span class="term"><a name="replace"></a>edit-&gt;replace (<b>ctrl-r</b>)</span>
+<a name="id2890838"></a><span class="term"><a name="replace"></a>edit-&gt;replace (<b>ctrl-r</b>)</span>
</dt>
<dd><p>
-<a name="id2877747"></a>this command opens the replace dialog box. the replace dialog is
+<a name="id2890924"></a>this command opens the replace dialog box. the replace dialog is
almost identical to the above-mentioned find dialog. in addition to the features in
the find dialog it contains a replace with: text
entry/dropdown box. using this dialog the user can specify both the text to be found
@@ -577,26 +563,25 @@ and text with which to replace it. the additional prompt
on replace option allows the user to have kwrite ask for
confirmation before each replacement.</p></dd>
<dt>
-<a name="id2877796"></a><span class="term"><a name="insertfile"></a>
+<a name="id2890972"></a><span class="term"><a name="insertfile"></a>
edit-&gt;insert file</span>
</dt>
<dd><p>
-<a name="id2877853"></a>this opens the file <a href="#open">open</a> dialog box whereby the
+<a name="id2891030"></a>this opens the file <a href="#open">open</a> dialog box whereby the
user can insert a complete file in the open document. the the contents of
the file will be entered at the position of the blinking text
cursor.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="go"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="go"></a><span class="title">the go menu</span>
-</h2></div></div>
+<a name="go"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="go"></a>the go menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2877949"></a><span class="term"><a name="go-to-line"></a>go-&gt;go to line</span>
+<a name="id2891125"></a><span class="term"><a name="go-to-line"></a>go-&gt;go to line</span>
</dt>
<dd><p>
-<a name="id2878002"></a>this opens the goto line dialog box which is used to have the cursor jump
+<a name="id2891179"></a>this opens the goto line dialog box which is used to have the cursor jump
to a particular line (specified by number) in the document. the line number may
be entered directly into the text box or graphically by clicking on the up or
down arrow spin controls at the side of the text box. the little up arrow will
@@ -604,11 +589,11 @@ increase the line number and the down arrow decrease it. there is also a slide
control to the right of the text box which allows the user to move the goto
point in the document in an analog manner.</p></dd>
<dt>
-<a name="id2878030"></a><span class="term"><a name="add-marker"></a>go-&gt;add marker (<b>ctrl-m</b>)</span>
+<a name="id2891207"></a><span class="term"><a name="add-marker"></a>go-&gt;add marker (<b>ctrl-m</b>)</span>
</dt>
<dd>
<p>
-<a name="id2878115"></a>this creates a marker in the document at the line where the cursor is
+<a name="id2891292"></a>this creates a marker in the document at the line where the cursor is
located and places it at the bottom of the list of markers located at the
bottom of the go menu.</p>
<p>markers are points within a kwrite document
@@ -616,33 +601,32 @@ marked for easy return. if the user thinks (s)he may need to return to a specif
point (s)he may by way of this feature instruct kwrite to remember it. </p>
</dd>
<dt>
-<a name="id2878163"></a><span class="term"><a name="set-bookmark"></a>go-&gt;set marker</span>
+<a name="id2891339"></a><span class="term"><a name="set-bookmark"></a>go-&gt;set marker</span>
</dt>
<dd><p>
-<a name="id2878217"></a>this creates a marker in the document at the line where the cursor is
+<a name="id2891394"></a>this creates a marker in the document at the line where the cursor is
located, and allows the user to choose its position in the list of bookmarks
which is appended at the bottom of this menu item.</p></dd>
<dt>
-<a name="id2878239"></a><span class="term"><a name="clear-bookmarks"></a>go-&gt;clear markers</span>
+<a name="id2891415"></a><span class="term"><a name="clear-bookmarks"></a>go-&gt;clear markers</span>
</dt>
<dd><p>
-<a name="id2878293"></a>this command will remove all the markers from the docucument as well as the
+<a name="id2891470"></a>this command will remove all the markers from the docucument as well as the
list of markers which is appended at the bottom of this menu item.</p></dd>
</dl></div>
<p>at the bottom of this menu, a list of markers appears if any
markers are available for this window.</p>
</div>
<div class="sect1">
-<a name="tools"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="tools"></a><span class="title">the tools menu</span>
-</h2></div></div>
+<a name="tools"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="tools"></a>the tools menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2878364"></a><span class="term"><a name="spelling..."></a>tools-&gt;spelling...</span>
+<a name="id2891541"></a><span class="term"><a name="spelling..."></a>tools-&gt;spelling...</span>
</dt>
<dd>
<p>
-<a name="id2878419"></a>this initiates the spell checking program - a program
+<a name="id2891596"></a>this initiates the spell checking program - a program
designed to help the user catch and correct any spelling errors.
clicking on this entry will start the checker and bring up the speller dialog
box through which the user can control the process. there are three text boxes
@@ -650,26 +634,26 @@ lined up vertically in the center of the dialog with their corresponding labels
just to the left. starting at the top they are:</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2878453"></a><span class="term">misspelled word:</span>
+<a name="id2891630"></a><span class="term">misspelled word:</span>
</dt>
<dd><p>
-<a name="id2878470"></a>here, the spell checker indicates the word currently under
+<a name="id2891647"></a>here, the spell checker indicates the word currently under
consideration. this happens when the checker encounters a word not in its
dictionary - a file containing a list of correctly spelled words against which
it compares each word in the editor.</p></dd>
<dt>
-<a name="id2878492"></a><span class="term">replacement:</span>
+<a name="id2891669"></a><span class="term">replacement:</span>
</dt>
<dd><p>
-<a name="id2878510"></a> if the checker has any similar words in its dictionary the
+<a name="id2891686"></a> if the checker has any similar words in its dictionary the
first one will be listed here. the user can accept the suggestion, type in his
or her own correction, or choose a different suggestion from the next
box.</p></dd>
<dt>
-<a name="id2878531"></a><span class="term">suggestions:</span>
+<a name="id2891708"></a><span class="term">suggestions:</span>
</dt>
<dd><p>
-<a name="id2878548"></a> the checker may list here a number of possible replacements for
+<a name="id2891725"></a> the checker may list here a number of possible replacements for
the word under consideration. clicking on any one of the suggestions will cause
that word to be entered in the replacement: box,
above.</p></dd>
@@ -678,54 +662,55 @@ above.</p></dd>
control the spell check process. they are:</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2878596"></a><span class="term">replace</span>
+<a name="id2891772"></a><span class="term">replace</span>
</dt>
<dd><p>
-<a name="id2878613"></a> this button has the checker replace the word under
+<a name="id2891789"></a> this button has the checker replace the word under
consideration in the document with the word in the
replacement: box.</p></dd>
<dt>
-<a name="id2878640"></a><span class="term">replace all</span>
+<a name="id2891817"></a><span class="term">replace all</span>
</dt>
<dd><p>
-<a name="id2878657"></a> this button causes the checker to replace not only the current
+<a name="id2891834"></a> this button causes the checker to replace not only the current
misspelled word: but to automatically make the same
substitution for any other occurences of this misspelled
word: in the document.</p></dd>
<dt>
-<a name="id2878693"></a><span class="term">ignore</span>
+<a name="id2891870"></a><span class="term">ignore</span>
</dt>
<dd><p>
-<a name="id2878710"></a>activating this button will have the checker move on without
+<a name="id2891887"></a>activating this button will have the checker move on without
making any changes.</p></dd>
<dt>
-<a name="id2878729"></a><span class="term">ignore all</span>
+<a name="id2891906"></a><span class="term">ignore all</span>
</dt>
<dd>
<p>
-<a name="id2878746"></a> this button tells the checker to do nothing with the current
+<a name="id2891923"></a> this button tells the checker to do nothing with the current
misspelled word: and to pass over any other instances of
the same word.</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2878770">Note</a></h3>
+<h3 class="title">
+<a name="id2891947"></a>Note</h3>
<p>this only applies to the current spell check
run. if the checker is run again later it will stop on this same
word.</p>
</div>
</dd>
<dt>
-<a name="id2878792"></a><span class="term">add</span>
+<a name="id2891968"></a><span class="term">add</span>
</dt>
<dd><p>
-<a name="id2878808"></a>pressing this button adds the word in the misspelled
+<a name="id2891985"></a>pressing this button adds the word in the misspelled
word: box to the checker's dictionary. this means that in the future
the checker will always consider this word to be correctly
spelled.</p></dd>
<dt>
-<a name="id2878837"></a><span class="term">stop</span>
+<a name="id2892014"></a><span class="term">stop</span>
</dt>
<dd><p>
-<a name="id2878854"></a> this button stops the spell check process.</p></dd>
+<a name="id2892031"></a> this button stops the spell check process.</p></dd>
</dl></div>
<p>located horizontally along the bottom of the spell check dialog is a
progress bar. as the checking process proceeds the bar will fill from left to
@@ -733,7 +718,8 @@ right providing a graphical representation of how far along in the document the
process has reached. in addition, the progress is displayed numerically in
the center of the progress bar.</p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2878894">Note</a></h3>
+<h3 class="title">
+<a name="id2892071"></a>Note</h3>
<p>a numerical display of the spell check
process is simultaneously displayed in the status bar of the editor. the <a href="#show-statusbar">status bar</a> is the horizontal strip at the bottom
of the editor just outside of the text entry area.</p>
@@ -741,47 +727,47 @@ of the editor just outside of the text entry area.</p>
<p>two more buttons are located below the progress bar. they are:</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2878950"></a><span class="term">help</span>
+<a name="id2892126"></a><span class="term">help</span>
</dt>
<dd><p>
-<a name="id2878967"></a> this invokes the kde help system starting at the kwrite help
+<a name="id2892143"></a> this invokes the kde help system starting at the kwrite help
pages (this document).</p></dd>
<dt>
-<a name="id2878993"></a><span class="term">cancel</span>
+<a name="id2892170"></a><span class="term">cancel</span>
</dt>
<dd><p>
-<a name="id2879010"></a> this button cancels the spell check process.</p></dd>
+<a name="id2892187"></a> this button cancels the spell check process.</p></dd>
<dt>
-<a name="id2879029"></a><span class="term"><a name="indent"></a>tools-&gt;indent</span>
+<a name="id2892205"></a><span class="term"><a name="indent"></a>tools-&gt;indent</span>
</dt>
<dd><p>
-<a name="id2879073"></a>this increases the paragraph's indentation by one step. the size of the
-step depends on the <a href="#pref-indent"> indentation
+<a name="id2892250"></a>this increases the paragraph's indentation by one step. the size of the
+step depends on the <a href="#pref-indent" title="indent"> indentation
settings</a>.</p></dd>
<dt>
-<a name="id2879113"></a><span class="term"><a name="unindent"></a>tools-&gt;unindent</span>
+<a name="id2892289"></a><span class="term"><a name="unindent"></a>tools-&gt;unindent</span>
</dt>
<dd><p>
-<a name="id2879157"></a>this reduces the paragraph's indentation by one step. the size of the step
-depends on the <a href="#pref-indent"> indentation settings</a>.</p></dd>
+<a name="id2892334"></a>this reduces the paragraph's indentation by one step. the size of the step
+depends on the <a href="#pref-indent" title="indent"> indentation settings</a>.</p></dd>
<dt>
-<a name="id2879193"></a><span class="term"><a name="cleanindent"></a>tools-&gt;clean
+<a name="id2892369"></a><span class="term"><a name="cleanindent"></a>tools-&gt;clean
indentation</span>
</dt>
<dd><p>
-<a name="id2879237"></a>not yet implemented</p></dd>
+<a name="id2892414"></a>not yet implemented</p></dd>
<dt>
-<a name="id2879255"></a><span class="term">tools-&gt;comment</span>
+<a name="id2892432"></a><span class="term">tools-&gt;comment</span>
</dt>
<dd><p>
-<a name="id2879288"></a>this adds one space to the beginning of the line
+<a name="id2892464"></a>this adds one space to the beginning of the line
where the text cursor is located or to the beginning of any
selected lines.</p></dd>
<dt>
-<a name="id2879308"></a><span class="term">tools-&gt;uncomment</span>
+<a name="id2892484"></a><span class="term">tools-&gt;uncomment</span>
</dt>
<dd><p>
-<a name="id2879340"></a>this removes one space (if any exist) from the beginning of the line
+<a name="id2892517"></a>this removes one space (if any exist) from the beginning of the line
where the text cursor is located or from the beginning of any
selected lines.</p></dd>
</dl></div>
@@ -789,34 +775,33 @@ selected lines.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="settings"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="settings"></a><span class="title">the settings menu</span>
-</h2></div></div>
+<a name="settings"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="settings"></a>the settings menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2879406"></a><span class="term"><a name="show-toolbar"></a>settings-&gt;show toolbar</span>
+<a name="id2892583"></a><span class="term"><a name="show-toolbar"></a>settings-&gt;show toolbar</span>
</dt>
<dd><p>
-<a name="id2879464"></a>when checked, this displays a movable toolbar containing buttons used to
+<a name="id2892641"></a>when checked, this displays a movable toolbar containing buttons used to
initiate frequently used commands. when unchecked the toolbar is hidden.</p></dd>
<dt>
-<a name="id2879485"></a><span class="term"><a name="show-statusbar"></a>settings-&gt;show statusbar</span>
+<a name="id2892661"></a><span class="term"><a name="show-statusbar"></a>settings-&gt;show statusbar</span>
</dt>
<dd><p>
-<a name="id2879543"></a>when checked, this displays a small bar at the bottom of the editor
+<a name="id2892719"></a>when checked, this displays a small bar at the bottom of the editor
containing information about the status of the current document. when unchecked
the statusbar is hidden.</p></dd>
<dt>
-<a name="id2879564"></a><span class="term"><a name="show-path"></a>settings-&gt;show path</span>
+<a name="id2892740"></a><span class="term"><a name="show-path"></a>settings-&gt;show path</span>
</dt>
<dd><p>
-<a name="id2879621"></a>when selected, this displays in the title bar the path (its location in the
+<a name="id2892798"></a>when selected, this displays in the title bar the path (its location in the
file system) of the current document. when unchecked the path is hidden.</p></dd>
<dt>
-<a name="id2879642"></a><span class="term"><a name="configure-keybindings"></a>settings-&gt;configure key bindings</span>
+<a name="id2892818"></a><span class="term"><a name="configure-keybindings"></a>settings-&gt;configure key bindings</span>
</dt>
<dd><p>
-<a name="id2879700"></a>this command opens a dialog box whereby the <a href="#keybindings">key bindings</a> may be changed. a display window at
+<a name="id2892877"></a>this command opens a dialog box whereby the <a href="#keybindings" title="key bindings">key bindings</a> may be changed. a display window at
the top of the dialog box shows the list of commands (actions) that can have
keyboard shortcuts. below the display are three radio buttons. the user may choose
between no key, default key, and custom key. (note that a set of radio buttons only
@@ -833,10 +818,10 @@ would mean that anytime he or she held down the <b>ctrl</b> and
<b>alt</b> buttons and pressed <b>k</b> (while using
kwrite) the about kde display box would be called. </p></dd>
<dt>
-<a name="id2879814"></a><span class="term"><a name="configure-toolbars"></a>settings-&gt;configure toolbars</span>
+<a name="id2892990"></a><span class="term"><a name="configure-toolbars"></a>settings-&gt;configure toolbars</span>
</dt>
<dd><p>
-<a name="id2879872"></a>this will open the dialog whereby the toolbar configuration may
+<a name="id2893048"></a>this will open the dialog whereby the toolbar configuration may
be changed. the user can choose which shortcut buttons should appear on the
toolbar. a display window on the left lists the commands available to placed
on the toolbar. a display on the right lists those commands already on the
@@ -848,82 +833,81 @@ window from the toolbar. the up and down pointing arrows change the position of
an action selected in the right window which changes the position of its button
in the toolbar.</p></dd>
<dt>
-<a name="id2879912"></a><span class="term"><a name="preferences"></a>settings-&gt;preferences</span>
+<a name="id2893089"></a><span class="term"><a name="preferences"></a>settings-&gt;preferences</span>
</dt>
<dd><p>
-<a name="id2879967"></a>this menu item opens a dialog whereby several different <a href="#pref-dialog">settings</a> may be adjusted.</p></dd>
+<a name="id2893143"></a>this menu item opens a dialog whereby several different <a href="#pref-dialog" title="Chapter 4. configure kwrite">settings</a> may be adjusted.</p></dd>
<dt>
-<a name="id2880006"></a><span class="term">settings-&gt;configure
+<a name="id2893182"></a><span class="term">settings-&gt;configure
highlighting</span>
</dt>
<dd><p>
-<a name="id2880052"></a>opens a dialog box allowing configuration of the syntax
-highlighting. the dialog is described in <a href="#pref-highlighting">Chapter 5., <i>highlighting</i></a>.</p></dd>
+<a name="id2893228"></a>opens a dialog box allowing configuration of the syntax
+highlighting. the dialog is described in <a href="#pref-highlighting" title="Chapter 5. highlighting">Chapter 5. highlighting</a>.</p></dd>
<dt>
-<a name="id2880089"></a><span class="term"><a name="vertical-selection"></a>settings-&gt;vertical
+<a name="id2893265"></a><span class="term"><a name="vertical-selection"></a>settings-&gt;vertical
selection</span>
</dt>
<dd><p>
-<a name="id2880144"></a>this is used to turn on or off the vertical selection feature. vertical
+<a name="id2893321"></a>this is used to turn on or off the vertical selection feature. vertical
selection allows text to be selected by column as well as by row. in other
words with this feature the user is able to select text contained in only
particular contiguous columns and rows. in affect the user can select a
rectangular area of text anywhere in the document.</p></dd>
<dt>
-<a name="id2880168"></a><span class="term"><a name="set-highlight"></a>settings-&gt;highlight mode</span>
+<a name="id2893345"></a><span class="term"><a name="set-highlight"></a>settings-&gt;highlight mode</span>
</dt>
<dd><p>
-<a name="id2880223"></a>this allows the user to choose the style of color highlighting which the
+<a name="id2893400"></a>this allows the user to choose the style of color highlighting which the
editor uses to display the text. the styles are selected by programming
language. the font/color information is not stored with the document.</p></dd>
<dt>
-<a name="id2880245"></a><span class="term"><a name="end-of-line"></a>settings-&gt;end of line</span>
+<a name="id2893421"></a><span class="term"><a name="end-of-line"></a>settings-&gt;end of line</span>
</dt>
<dd><p>
-<a name="id2880300"></a>this opens a sub-menu from which the user can select the type of `end of
-line' code for kwrite to use, i.e., the accepted standard
+<a name="id2893476"></a>this opens a sub-menu from which the user can select the type of &#x2018;end of
+line&#x2019; code for kwrite to use, i.e., the accepted standard
used by unix, mac® or msdos/windows® systems.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="help"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="help"></a><span class="title">the help menu</span>
-</h2></div></div>
+<a name="help"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="help"></a>the help menu</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2880410"></a><span class="term"><a name="contents"></a>help-&gt;contents (<b>f1</b>)</span>
+<a name="id2893586"></a><span class="term"><a name="contents"></a>help-&gt;contents (<b>f1</b>)</span>
</dt>
<dd><p>
-<a name="id2880487"></a>this invokes the kde help system starting at the kwrite help pages (this document).</p></dd>
+<a name="id2893664"></a>this invokes the kde help system starting at the kwrite help pages (this document).</p></dd>
<dt>
-<a name="id2880514"></a><span class="term"><a name="whats-this"></a>help-&gt;what's this? (<b>shift-f1</b>)</span>
+<a name="id2893691"></a><span class="term"><a name="whats-this"></a>help-&gt;what's this? (<b>shift-f1</b>)</span>
</dt>
<dd><p>
-<a name="id2880602"></a>this changes the mouse cursor to a combination arrow and question mark.
+<a name="id2893778"></a>this changes the mouse cursor to a combination arrow and question mark.
clicking on items within kwrite with this arrow will open a help window (if
one exists for the particular item) explaining the item's function.</p></dd>
<dt>
-<a name="id2880631"></a><span class="term"><a name="report-bug"></a>help-&gt;report bug</span>
+<a name="id2893808"></a><span class="term"><a name="report-bug"></a>help-&gt;report bug</span>
</dt>
<dd><p>
-<a name="id2880685"></a>this calls a dialog box to help
+<a name="id2893862"></a>this calls a dialog box to help
the user help the kde team to track down and solve any
problems(bugs) in the program. the dialog attempts to do this by
means of email using the information given by the user.</p></dd>
<dt>
-<a name="id2880709"></a><span class="term"><a name="about-kwrite"></a>help-&gt;about kwrite</span>
+<a name="id2893886"></a><span class="term"><a name="about-kwrite"></a>help-&gt;about kwrite</span>
</dt>
<dd><p>
-<a name="id2880764"></a>this will display version and author information</p></dd>
+<a name="id2893940"></a>this will display version and author information</p></dd>
<dt>
-<a name="id2880782"></a><span class="term"><a name="about-kde"></a>help-&gt;about kde</span>
+<a name="id2893959"></a><span class="term"><a name="about-kde"></a>help-&gt;about kde</span>
</dt>
<dd><p>
-<a name="id2880839"></a>this displays the kde version and other basic information.</p></dd>
+<a name="id2894015"></a>this displays the kde version and other basic information.</p></dd>
</dl></div>
</div>
</div>
-<div id="pref-dialog" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="pref-dialog"></a>Chapter 4. configure kwrite</h2></div></div>
<div class="toc">
@@ -955,9 +939,8 @@ colors, indent,
select, edit, and
spelling are detailed below.</p>
<div class="sect1">
-<a name="prefcolors"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="prefcolors"></a><span class="title">colors</span>
-</h2></div></div>
+<a name="prefcolors"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="prefcolors"></a>colors</h2></div></div>
<p>this section provides access to <a href="#pref-color-settings">five different color settings</a>,
described below. each of these settings may be changed by clicking on its
corresponding button. these are special wide buttons that are the color of
@@ -1000,191 +983,189 @@ pre-prepared palettes.</p>
<a name="pref-color-settings"></a><span class="term">background</span>
</dt>
<dd><p>
-<a name="id2881181"></a>here the user can specify a color for the general background of
+<a name="id2894357"></a>here the user can specify a color for the general background of
kwrite.</p></dd>
<dt>
-<a name="id2881207"></a><span class="term">text background</span>
+<a name="id2894384"></a><span class="term">text background</span>
</dt>
<dd><p>
-<a name="id2881224"></a>this is used to set a particular color to display in the
+<a name="id2894401"></a>this is used to set a particular color to display in the
background of those areas of the document containing text.</p></dd>
<dt>
-<a name="id2881244"></a><span class="term">selected</span>
+<a name="id2894421"></a><span class="term">selected</span>
</dt>
<dd><p>
-<a name="id2881261"></a>this allows the user to select a color to be used for indicating
+<a name="id2894438"></a>this allows the user to select a color to be used for indicating
selected (or highlighted) portions of the document.</p></dd>
<dt>
-<a name="id2881281"></a><span class="term">found</span>
+<a name="id2894457"></a><span class="term">found</span>
</dt>
<dd><p>
-<a name="id2881298"></a>this specifies the preferred color with which to mark text
+<a name="id2894474"></a>this specifies the preferred color with which to mark text
encountered as the result of a <a href="#find">find</a>
operation.</p></dd>
<dt>
-<a name="id2881333"></a><span class="term">selected + found</span>
+<a name="id2894510"></a><span class="term">selected + found</span>
</dt>
<dd><p>
-<a name="id2881350"></a>this sets the color for text that has not only been found as in
+<a name="id2894527"></a>this sets the color for text that has not only been found as in
the previous entry above but that has also been selected.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="pref-indent"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="pref-indent"></a><span class="title">indent</span>
-</h2></div></div>
+<a name="pref-indent"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="pref-indent"></a>indent</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2881403"></a><span class="term">auto indent</span>
+<a name="id2894579"></a><span class="term">auto indent</span>
</dt>
<dd><p>
-<a name="id2881419"></a>this causes
+<a name="id2894596"></a>this causes
new lines to begin with the same indentation level as the previous
line.</p></dd>
<dt>
-<a name="id2881439"></a><span class="term">indent with spaces</span>
+<a name="id2894615"></a><span class="term">indent with spaces</span>
</dt>
<dd><p>
-<a name="id2881456"></a>this
+<a name="id2894632"></a>this
replaces tabs with the number of spaces selected in the tab width window in
-the <a href="#pref-edit">edit</a> section of the preferences
+the <a href="#pref-edit" title="edit">edit</a> section of the preferences
dialog.</p></dd>
<dt>
-<a name="id2881495"></a><span class="term">backspace key indents</span>
+<a name="id2894672"></a><span class="term">backspace key indents</span>
</dt>
<dd><p>
-<a name="id2881512"></a>this allows the
+<a name="id2894689"></a>this allows the
backspace key to be used to
indent.</p></dd>
<dt>
-<a name="id2881546"></a><span class="term">tab key indents</span>
+<a name="id2894723"></a><span class="term">tab key indents</span>
</dt>
<dd><p>
-<a name="id2881564"></a>this
+<a name="id2894740"></a>this
allows the tab key to be used to
indent.</p></dd>
<dt>
-<a name="id2881598"></a><span class="term">keep indent profile</span>
+<a name="id2894774"></a><span class="term">keep indent profile</span>
</dt>
<dd><p>
-<a name="id2881615"></a>this
+<a name="id2894791"></a>this
retains current indentation settings for future documents.</p></dd>
<dt>
-<a name="id2881633"></a><span class="term">keep extra spaces</span>
+<a name="id2894810"></a><span class="term">keep extra spaces</span>
</dt>
<dd><p>
-<a name="id2881650"></a>indentations of more than the selected number of spaces
+<a name="id2894827"></a>indentations of more than the selected number of spaces
will not be shortened.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="pref-select"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="pref-select"></a><span class="title">select</span>
-</h2></div></div>
+<a name="pref-select"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="pref-select"></a>select</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2881703"></a><span class="term">persistent selections</span>
+<a name="id2894879"></a><span class="term">persistent selections</span>
</dt>
<dd>
<p>
-<a name="id2881720"></a>this prevents key input or cursor movement by way of the
+<a name="id2894897"></a>this prevents key input or cursor movement by way of the
arrow keys from causing the elimination of text
selection. </p>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2881736">Note</a></h3>
+<h3 class="title">
+<a name="id2894913"></a>Note</h3>
<p>(note: if the overwrite selections option is
activated then any typed character input or paste operation will replace
the selected text.)</p>
</div>
</dd>
<dt>
-<a name="id2881758"></a><span class="term">overwrite selections</span>
+<a name="id2894935"></a><span class="term">overwrite selections</span>
</dt>
<dd><p>
-<a name="id2881775"></a>any keyed character input or paste operation will replace
+<a name="id2894952"></a>any keyed character input or paste operation will replace
the selected text. </p></dd>
<dt>
-<a name="id2881794"></a><span class="term">mouse autocopy</span>
+<a name="id2894971"></a><span class="term">mouse autocopy</span>
</dt>
<dd><p>
-<a name="id2881812"></a>any text
+<a name="id2894988"></a>any text
selected with the mouse will be automatically copied to the
clipboard.</p></dd>
<dt>
-<a name="id2881831"></a><span class="term">x11-like single selection</span>
+<a name="id2895007"></a><span class="term">x11-like single selection</span>
</dt>
<dd><p>
-<a name="id2881848"></a>not implemented yet.</p></dd>
+<a name="id2895024"></a>not implemented yet.</p></dd>
<dt>
-<a name="id2881866"></a><span class="term">vertical selections</span>
+<a name="id2895042"></a><span class="term">vertical selections</span>
</dt>
<dd><p>
-<a name="id2881883"></a>this
+<a name="id2895060"></a>this
activates the <a href="#vertical-selection">vertical selection</a>
option.</p></dd>
<dt>
-<a name="id2881922"></a><span class="term">toggle old</span>
+<a name="id2895098"></a><span class="term">toggle old</span>
</dt>
<dd><p>
-<a name="id2881936"></a>not yet implemented</p></dd>
+<a name="id2895113"></a>not yet implemented</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="pref-edit"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="pref-edit"></a><span class="title">edit</span>
-</h2></div></div>
+<a name="pref-edit"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="pref-edit"></a>edit</h2></div></div>
<div class="variablelist"><dl>
<dt>
-<a name="id2881986"></a><span class="term">word wrap</span>
+<a name="id2895163"></a><span class="term">word wrap</span>
</dt>
<dd><p>
-<a name="id2882013"></a>word wrap is a feature that causes the editor to
+<a name="id2895189"></a>word wrap is a feature that causes the editor to
automatically start a new line of text and move (wrap) the cursor to the
beginning of that new line. kwrite will automatically start a new line of text
when the current line reaches the length specified by the <a href="#pref-wrap-words-at">wrap words at:</a>
option.</p></dd>
<dt>
-<a name="id2882063"></a><span class="term">wrap words
+<a name="id2895239"></a><span class="term">wrap words
at:</span>
</dt>
<dd><p>
-<a name="id2882089"></a>if the <a href="#pref-word-wrap">word wrap</a> option is selected this entry
+<a name="id2895266"></a>if the <a href="#pref-word-wrap">word wrap</a> option is selected this entry
determines the length (in characters) at which the editor will
automatically start a new line.</p></dd>
<dt>
-<a name="id2882128"></a><span class="term">replace tabs by
+<a name="id2895305"></a><span class="term">replace tabs by
spaces</span>
</dt>
<dd><p>
-<a name="id2882156"></a>kwrite will replace any tabs
+<a name="id2895332"></a>kwrite will replace any tabs
with the number of spaces indicated in the <a href="#pref-tab-width">tab width:</a> entry.</p></dd>
<dt>
-<a name="id2882200"></a><span class="term">tab width</span>
+<a name="id2895377"></a><span class="term">tab width</span>
</dt>
<dd><p>
-<a name="id2882225"></a>if the <a href="#pref-word-wrap">replace tabs by spaces</a>
+<a name="id2895402"></a>if the <a href="#pref-word-wrap">replace tabs by spaces</a>
option is selected this entry determines the number of spaces with which
the editor will automatically replace tabs.</p></dd>
<dt>
-<a name="id2882264"></a><span class="term">remove trailing spaces</span>
+<a name="id2895440"></a><span class="term">remove trailing spaces</span>
</dt>
<dd><p>
-<a name="id2882281"></a>kwrite will automatically eliminate extra spaces at the
+<a name="id2895457"></a>kwrite will automatically eliminate extra spaces at the
ends of lines of text.</p></dd>
<dt>
-<a name="id2882305"></a><span class="term">auto brackets</span>
+<a name="id2895482"></a><span class="term">auto brackets</span>
</dt>
<dd><p>
-<a name="id2882322"></a>when the
+<a name="id2895499"></a>when the
user types a left bracket ([,(, or {) kwrite automatically
enters the right bracket (}, ), or ]) to the right of the
cursor.</p></dd>
<dt>
-<a name="id2882350"></a><span class="term">group undos</span>
+<a name="id2895526"></a><span class="term">group undos</span>
</dt>
<dd>
<p>
-<a name="id2882376"></a>groups of similar actions are to be considered a single
+<a name="id2895552"></a>groups of similar actions are to be considered a single
<a href="#undo">undo</a> step by kwrite. in other words, a series
of regular character keystrokes (words or expressions) would be considered
one step and therefore be removed by a single undo operation. if the
@@ -1204,21 +1185,21 @@ button would only remove the last three letters typed, or the last three
operations.</p>
</dd>
<dt>
-<a name="id2882454"></a><span class="term">show tabs</span>
+<a name="id2895631"></a><span class="term">show tabs</span>
</dt>
<dd><p>
-<a name="id2882471"></a>the editor will display a symbol to indicate the presence
+<a name="id2895647"></a>the editor will display a symbol to indicate the presence
of a tab in the text.</p></dd>
<dt>
-<a name="id2882490"></a><span class="term">smart home</span>
+<a name="id2895666"></a><span class="term">smart home</span>
</dt>
<dd><p>
-<a name="id2882507"></a>not yet implemented</p></dd>
+<a name="id2895683"></a>not yet implemented</p></dd>
<dt>
-<a name="id2882524"></a><span class="term">page up/down moves cursor</span>
+<a name="id2895701"></a><span class="term">page up/down moves cursor</span>
</dt>
<dd><p>
-<a name="id2882542"></a>this option changes the behavior of the cursor when
+<a name="id2895718"></a>this option changes the behavior of the cursor when
the user presses the <b>page up</b> or <b>page down</b> key. if
unselected the text cursor will maintain its relative position within the visible
text in kwrite as new text becomes visible as a result of the operation. so if
@@ -1227,10 +1208,10 @@ remain there (except when one reaches the beginning or end.) with this
option selected, the first key press will cause the cursor to move to either the top
or bottom of the visible text as a new page of text is displayed.</p></dd>
<dt>
-<a name="id2882593"></a><span class="term">wrap cursor</span>
+<a name="id2895769"></a><span class="term">wrap cursor</span>
</dt>
<dd><p>
-<a name="id2882607"></a>when this option is chosen, moving
+<a name="id2895783"></a>when this option is chosen, moving
the cursor with the arrow keys off the end of a line (to the right) causes
it to jump down to the beginning of the next line. likewise when the
cursor is moved past the beginning of a line (to the left) it jumps up to
@@ -1239,10 +1220,10 @@ cursor right past the end of a line merely causes it to continue
horizontally in the same line and trying to move it left past the beginning
does nothing.</p></dd>
<dt>
-<a name="id2882634"></a><span class="term"><a href="#undo">undo</a> steps:</span>
+<a name="id2895810"></a><span class="term"><a href="#undo">undo</a> steps:</span>
</dt>
<dd><p>
-<a name="id2882662"></a>here
+<a name="id2895838"></a>here
the user may specify the number of steps kwrite will retain in memory for
purposes of undoing entries and actions. this means that the higher the
number of steps set the more memory kwrite will use for this. setting
@@ -1252,61 +1233,60 @@ button 10 times and obtain results.</p></dd>
</dl></div>
</div>
<div class="sect1">
-<a name="prefspellchecker"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="prefspellchecker"></a><span class="title">spelling</span>
-</h2></div></div>
+<a name="prefspellchecker"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="prefspellchecker"></a>spelling</h2></div></div>
<p>a spell checker is a program designed to
help the user catch and correct any spelling errors. this section of the
preferences dialog allows certain important settings to be adjusted in this
regard.</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2882762"></a><span class="term">create root/affix combinations not in
+<a name="id2895938"></a><span class="term">create root/affix combinations not in
dictionary</span>
</dt>
<dd><p>
-<a name="id2882780"></a>selecting this option allows
+<a name="id2895956"></a>selecting this option allows
the spell checker to register as 'correct' combinations of root words with
suffixes or prefixes even if the particular combination is not listed in
its dictionary data base of words.</p></dd>
<dt>
-<a name="id2882801"></a><span class="term">consider run-together words as spelling
+<a name="id2895978"></a><span class="term">consider run-together words as spelling
errors</span>
</dt>
<dd><p>
-<a name="id2882819"></a>selecting this will cause the
+<a name="id2895995"></a>selecting this will cause the
spell checker to register as 'misspelled' two or more correctly spelled
words that are 'run-together', i.e., that do not have spaces
separating them.</p></dd>
<dt>
-<a name="id2882847"></a><span class="term">dictionary:</span>
+<a name="id2896024"></a><span class="term">dictionary:</span>
</dt>
<dd><p>
-<a name="id2882864"></a>depending on
+<a name="id2896041"></a>depending on
the user's installation one or more different language spelling
dictionaries may be available. this drop down box allows the user to
choose which language the spell checker should use.</p></dd>
<dt>
-<a name="id2882886"></a><span class="term">encoding:</span>
+<a name="id2896062"></a><span class="term">encoding:</span>
</dt>
<dd><p>
-<a name="id2882902"></a>there are
+<a name="id2896079"></a>there are
different coding systems used to associate particular codes with particular
characters and symbols. if the user knows which code he or she is using
this drop down box allows this code to be specified so that the spell
checker can do its job correctly. </p></dd>
<dt>
-<a name="id2882925"></a><span class="term">client:</span>
+<a name="id2896102"></a><span class="term">client:</span>
</dt>
<dd><p>
-<a name="id2882942"></a>since kwrite
+<a name="id2896118"></a>since kwrite
does not contain its own spell checker, an external one must be chosen.
this is where the user may specify which spell check program to
use.</p></dd>
</dl></div>
</div>
</div>
-<div id="pref-highlighting" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="pref-highlighting"></a>Chapter 5. highlighting</h2></div></div>
<p>the configure highlighting dialog consists of two
@@ -1317,21 +1297,21 @@ appropriate tab at the top of the dialog</p>
follows:</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2883056"></a><span class="term">default item styles</span>
+<a name="id2896233"></a><span class="term">default item styles</span>
</dt>
<dd>
<p>
-<a name="id2883074"></a>the user can configure the default appearance for particular items.
+<a name="id2896250"></a>the user can configure the default appearance for particular items.
this would allow a programmer to more easily identify different items (types of
entries) in his or her code.
</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2883098"></a><span class="term">item</span>
+<a name="id2896274"></a><span class="term">item</span>
</dt>
<dd><p>
-<a name="id2883114"></a>this drop down list offers a variety of items that the user
+<a name="id2896291"></a>this drop down list offers a variety of items that the user
might want to highlight. they include normal for
text does not fit in any of the other categories, comment,
string, keyword and many more. not
@@ -1339,59 +1319,59 @@ all of these entries will need to be configured for every language and so may be
selected as needed. the options in the rest of this section apply
to the entry selected in this box.</p></dd>
<dt>
-<a name="id2883170"></a><span class="term">normal</span>
+<a name="id2896346"></a><span class="term">normal</span>
</dt>
<dd><p>
-<a name="id2883186"></a>this allows the user to choose the item's normal
+<a name="id2896363"></a>this allows the user to choose the item's normal
(unselected) color. this is done by means of a color selection
-dialog box, a further explanation of which may be found in the <a href="#prefcolors">colors</a> section of <a href="#pref-dialog">configure kwrite</a>.</p></dd>
+dialog box, a further explanation of which may be found in the <a href="#prefcolors" title="colors">colors</a> section of <a href="#pref-dialog" title="Chapter 4. configure kwrite">configure kwrite</a>.</p></dd>
<dt>
-<a name="id2883243"></a><span class="term">bold</span>
+<a name="id2896420"></a><span class="term">bold</span>
</dt>
<dd><p>
-<a name="id2883260"></a>this option determines whether or not the item should be displayed in
+<a name="id2896436"></a>this option determines whether or not the item should be displayed in
bold text.</p></dd>
<dt>
-<a name="id2883279"></a><span class="term">italic</span>
+<a name="id2896456"></a><span class="term">italic</span>
</dt>
<dd><p>
-<a name="id2883296"></a>this option determines whether or not the item should be displayed in italic
+<a name="id2896472"></a>this option determines whether or not the item should be displayed in italic
text.</p></dd>
<dt>
-<a name="id2883315"></a><span class="term">selected</span>
+<a name="id2896491"></a><span class="term">selected</span>
</dt>
<dd><p>
-<a name="id2883332"></a>this allows the user to choose the item's color
+<a name="id2896508"></a>this allows the user to choose the item's color
when selected. this is done by means of a color selection
-dialog box, a further explanation of which may be found in the <a href="#prefcolors">colors</a> section of <a href="#pref-dialog">configure kwrite</a>.</p></dd>
+dialog box, a further explanation of which may be found in the <a href="#prefcolors" title="colors">colors</a> section of <a href="#pref-dialog" title="Chapter 4. configure kwrite">configure kwrite</a>.</p></dd>
</dl></div>
</dd>
<dt>
-<a name="id2883389"></a><span class="term">default font</span>
+<a name="id2896566"></a><span class="term">default font</span>
</dt>
<dd>
<p>
-<a name="id2883406"></a>here the user can choose the default font for all
+<a name="id2896583"></a>here the user can choose the default font for all
text.</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2883428"></a><span class="term">family</span>
+<a name="id2896605"></a><span class="term">family</span>
</dt>
<dd><p>
-<a name="id2883445"></a>this is used to choose the font family. the default is fixed.
+<a name="id2896622"></a>this is used to choose the font family. the default is fixed.
for most programming purposes, a monospaced font (one in which a w takes up the same
amount of space as an i) may be the best choice.</p></dd>
<dt>
-<a name="id2883466"></a><span class="term">size</span>
+<a name="id2896643"></a><span class="term">size</span>
</dt>
<dd><p>
-<a name="id2883483"></a>the font size can be changed here. the default is 12
+<a name="id2896660"></a>the font size can be changed here. the default is 12
points.</p></dd>
<dt>
-<a name="id2883502"></a><span class="term">charset</span>
+<a name="id2896678"></a><span class="term">charset</span>
</dt>
<dd><p>
-<a name="id2883519"></a>here the user can choose which character set to work in.</p></dd>
+<a name="id2896695"></a>here the user can choose which character set to work in.</p></dd>
</dl></div>
</dd>
</dl></div>
@@ -1402,25 +1382,25 @@ specifically will use the default configuration specified on the previous
(defaults tab.</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2883586"></a><span class="term">config select</span>
+<a name="id2896763"></a><span class="term">config select</span>
</dt>
<dd>
<p>
-<a name="id2883604"></a>this group of options is used to customize the highlighting styles
+<a name="id2896780"></a>this group of options is used to customize the highlighting styles
for each programming language type. any changes you made in
other areas of this dialog apply only to this type.</p>
<div class="variablelist"><dl>
<dt>
-<a name="id2883628"></a><span class="term">highlight</span>
+<a name="id2896804"></a><span class="term">highlight</span>
</dt>
<dd><p>
-<a name="id2883644"></a>this is used to choose the language type to
+<a name="id2896821"></a>this is used to choose the language type to
configure</p></dd>
<dt>
-<a name="id2883663"></a><span class="term">item</span>
+<a name="id2896840"></a><span class="term">item</span>
</dt>
<dd><p>
-<a name="id2883680"></a>this is to choose the syntax item to configure. remember
+<a name="id2896856"></a>this is to choose the syntax item to configure. remember
this only configures <i>this</i> item for <i>this</i>
language.</p></dd>
</dl></div>
@@ -1434,10 +1414,10 @@ defaults page of this dialog box while leaving
highlight modes page.</p>
</dd>
<dt>
-<a name="id2883788"></a><span class="term">item style</span>
+<a name="id2896965"></a><span class="term">item style</span>
</dt>
<dd><p>
-<a name="id2883805"></a>here the user can configure the general appearance of the above
+<a name="id2896982"></a>here the user can configure the general appearance of the above
selected item. checking the default checkbox causes the default
style as configured on the previous tab to be set, or the
appearance can be configured directly. the available options are the same as on the
@@ -1445,10 +1425,10 @@ defaults tab: normal,
selected, bold and
italic.</p></dd>
<dt>
-<a name="id2883875"></a><span class="term">highlight auto select</span>
+<a name="id2897051"></a><span class="term">highlight auto select</span>
</dt>
<dd><p>
-<a name="id2883892"></a>kwrite can apply syntax highlighting automatically, depending
+<a name="id2897069"></a>kwrite can apply syntax highlighting automatically, depending
on the file extension or mime-type of the opened file. the defaults are fairly
comprehensive, but users that regularly edit files with non-standard extensions
can add them here. wildcards are allowed in the file
@@ -1456,11 +1436,11 @@ extensions text box. for example, the default entry for the c++
language is <b><tt>*.cpp;*.cc;*.c;*.h</tt></b>. opening a file called
<tt>foo.h</tt> would automatically apply the c++ style to it.</p></dd>
<dt>
-<a name="id2883946"></a><span class="term">item font</span>
+<a name="id2897122"></a><span class="term">item font</span>
</dt>
<dd>
<p>
-<a name="id2883963"></a>here the user can choose the font for the selected item.</p>
+<a name="id2897139"></a>here the user can choose the font for the selected item.</p>
<p>the default style can be applied by checking the
default checkbox or the user can choose a specific font
family, size and
@@ -1469,7 +1449,7 @@ the defaults tab.</p>
</dd>
</dl></div>
</div>
-<div id="credits" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="credits"></a>Chapter 6. credits and licenses</h2></div></div>
<p>kwrite copyright 2000 by jochen wilhelmy
@@ -1478,16 +1458,16 @@ the defaults tab.</p>
<p>contributions:</p>
<div class="itemizedlist"><ul>
<li><p>
-<a name="id2884091"></a>additional contributions by glen parker <tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt>
+<a name="id2897268"></a>additional contributions by glen parker <tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt>
</p></li>
<li><p>
-<a name="id2884113"></a>michael koch <tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt>
+<a name="id2897290"></a>michael koch <tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt>
</p></li>
</ul></div>
<p>documentation by thad mcginnis <tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt>
</p>
<div class="itemizedlist"><ul><li><p>
-<a name="id2884157"></a>this version of the kwrite handbook is based on the original by cristian tibirna <tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt>
+<a name="id2897334"></a>this version of the kwrite handbook is based on the original by cristian tibirna <tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt>
</p></li></ul></div>
<p>converted to docbook/proofreading by lauri watts <tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt>
</p>
@@ -1496,7 +1476,7 @@ the defaults tab.</p>
license</a>.</p>
<p>this program is licensed under the terms of the <a href="common/gpl-translated.html" target="_top">gnu general public license</a>.</p>
</div>
-<div id="installation" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
<a name="installation"></a>Appendix A. installation</h2></div></div>
<p>kwrite is packaged as part of the kdebase package. for more information
diff --git a/tests/docbook/result/html/multilingual.html b/tests/docbook/result/html/multilingual.html
index 14e4b86d..f8846b5e 100644
--- a/tests/docbook/result/html/multilingual.html
+++ b/tests/docbook/result/html/multilingual.html
@@ -3,745 +3,766 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Multilingual Test Document</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799188">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2812391">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799188"></a>Multilingual Test Document</h1></div>
+<a name="id2812391"></a>Multilingual Test Document</h1></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#cachap">Catalan</a>
+<dt>1 <a href="#cachap">Catalan</a>
</dt>
-<dt>2. <a href="#cschap">Czech</a>
+<dt>2 <a href="#cschap">Czech</a>
</dt>
-<dt>3. <a href="#dachap">Danish</a>
+<dt>3 <a href="#dachap">Danish</a>
</dt>
-<dt>4. <a href="#eschap">Spanish</a>
+<dt>4 <a href="#eschap">Spanish</a>
</dt>
-<dt>5. <a href="#fichap">Finnish</a>
+<dt>5 <a href="#fichap">Finnish</a>
</dt>
-<dt>6. <a href="#frchap">French</a>
+<dt>6 <a href="#frchap">French</a>
</dt>
-<dt>7. <a href="#itchap">Italian</a>
+<dt>7 <a href="#itchap">Italian</a>
</dt>
-<dt>8. <a href="#dechap">German</a>
+<dt>8 <a href="#dechap">German</a>
</dt>
-<dt>9. <a href="#elchap">Greek</a>
+<dt>9 <a href="#elchap">Greek</a>
</dt>
-<dt>10. <a href="#enchap">English</a>
+<dt>10 <a href="#enchap">English</a>
</dt>
-<dt>11. <a href="#jachap">Japanese</a>
+<dt>11 <a href="#jachap">Japanese</a>
</dt>
-<dt>12. <a href="#rochap">Romanian</a>
+<dt>12 <a href="#rochap">Romanian</a>
</dt>
-<dt>13. <a href="#ruchap">Russian</a>
+<dt>13 <a href="#ruchap">Russian</a>
</dt>
-<dt>14. <a href="#nochap">Norsk</a>
+<dt>14 <a href="#nochap">Norsk</a>
</dt>
-<dt>15. <a href="#nlchap">Dutch</a>
+<dt>15 <a href="#nlchap">Dutch</a>
</dt>
-<dt>16. <a href="#plchap">Polish</a>
+<dt>16 <a href="#plchap">Polish</a>
</dt>
-<dt>17. <a href="#ptchap">Portuguese</a>
+<dt>17 <a href="#ptchap">Portuguese</a>
</dt>
-<dt>18. <a href="#ptbrchap">Portuguese (Brazilian)</a>
+<dt>18 <a href="#ptbrchap">Portuguese (Brazilian)</a>
</dt>
-<dt>19. <a href="#skchap">Slovak</a>
+<dt>19 <a href="#skchap">Slovak</a>
</dt>
-<dt>20. <a href="#svchap">Swedish</a>
+<dt>20 <a href="#svchap">Swedish</a>
</dt>
<dt><a href="#bibl">Bibliography</a></dt>
</dl>
</div>
-<div id="cachap" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="cachap"></a>Capítol 1. Catalan</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2757370">NOTA</a></h3>
+<h3 class="title">
+<a name="id2770545"></a>Nota</h3>
<p>
This paragraph would be in Catalan, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="cschap" class="chapter">
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="cschap"></a>Kapitola 2. Czech</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2799320">Poznámka</a></h3>
+<h3 class="title">
+<a name="id2812523"></a>Poznámka</h3>
<p>
This paragraph would be in Czech, if I knew any.
&#x201E;Quote test.&#x201C;
</p>
</div>
<p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="dachap" class="chapter">
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="dachap"></a>Kapitel 3. Danish</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2754040">NOTE</a></h3>
+<h3 class="title">
+<a name="id2767261"></a>Note</h3>
<p>
This paragraph would be in Danish, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="eschap" class="chapter">
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="eschap"></a>Capítulo 4. Spanish</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2754072">NOTA</a></h3>
+<h3 class="title">
+<a name="id2767206"></a>Nota</h3>
<p>
This paragraph would be in Spanish, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="fichap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="fichap"></a>Luku 5. Finnish</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2752844">HUOMAA</a></h3>
+<h3 class="title">
+<a name="id2766027"></a>Huomaa</h3>
<p>
This paragraph would be in Finnish, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="frchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="frchap"></a>Chapitre 6. French</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2753304">Note</a></h3>
+<h3 class="title">
+<a name="id2766428"></a>Note</h3>
<p>
This paragraph would be in French, if I knew any.
«Quote test.»
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="itchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="itchap"></a>Capitolo 7. Italian</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2752638">NOTA</a></h3>
+<h3 class="title">
+<a name="id2766829"></a>Nota</h3>
<p>
This paragraph would be in Italian, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="dechap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="dechap"></a>Kapitel 8. German</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2863112">Anmerkung</a></h3>
+<h3 class="title">
+<a name="id2876290"></a>Anmerkung</h3>
<p>
This paragraph would be in German, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="elchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="elchap"></a>ÊåöÜëáéï 9. Greek</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2863451">ÓÇÌÅÉÙÓÇ</a></h3>
+<h3 class="title">
+<a name="id2876629"></a>Óçìåßùóç</h3>
<p>
This paragraph would be in Greek, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="enchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="enchap"></a>Chapter 10. English</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2863790">Note</a></h3>
+<h3 class="title">
+<a name="id2876968"></a>Note</h3>
<p>
This paragraph is in English.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="jachap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="jachap"></a>&#x7AE0; 11. Japanese</h2></div></div>
+<a name="jachap"></a>&#x7B2C;11&#x7AE0;</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864129">&#x6CE8;&#x610F;</a></h3>
+<h3 class="title">
+<a name="id2877307"></a>&#x6CE8;&#x610F;</h3>
<p>
This paragraph would be in Japanese, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="rochap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="rochap"></a>Cap. 12. Romanian</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864469">NOTÃ</a></h3>
+<h3 class="title">
+<a name="id2877646"></a>Notã</h3>
<p>
This paragraph would be in Romanian, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="ruchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ruchap"></a>&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2864808">&#x417;&#x410;&#x41C;&#x415;&#x427;&#x410;&#x41D;&#x418;&#x415;</a></h3>
+<h3 class="title">
+<a name="id2877986"></a>&#x417;&#x430;&#x43C;&#x435;&#x447;&#x430;&#x43D;&#x438;&#x435;</h3>
<p>
This paragraph would be in Russian, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="nochap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="nochap"></a>Kapittel 14. Norsk</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2865147">NOTAT</a></h3>
+<h3 class="title">
+<a name="id2878325"></a>Notat</h3>
<p>
This paragraph would be in Norsk, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="nlchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="nlchap"></a>Hoofdstuk 15. Dutch</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2865487">N.B.</a></h3>
+<h3 class="title">
+<a name="id2878664"></a>Opmerking</h3>
<p>
This paragraph would be in Dutch, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="plchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="plchap"></a>Rozdzia³ 16. Polish</h2></div></div>
+<a name="plchap"></a>Rozdzia&#x142; 16. Polish</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2865826">NOTATKA</a></h3>
+<h3 class="title">
+<a name="id2879004"></a>Notatka</h3>
<p>
This paragraph would be in Polish, if I knew any.
-&#x201C;Quote test.&#x201D;
-</p>
-</div>
-<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="ptchap" class="chapter">
+&#x201E;Quote test.&#x201D;
+</p>
+</div>
+<p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ptchap"></a>Capítulo 17. Portuguese</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2866165">NOTA</a></h3>
+<h3 class="title">
+<a name="id2879343"></a>Nota</h3>
<p>
This paragraph would be in Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="ptbrchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ptbrchap"></a>Capítulo 18. Portuguese (Brazilian)</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2866504">NOTA</a></h3>
+<h3 class="title">
+<a name="id2879682"></a>Nota</h3>
<p>
This paragraph would be in Brazilian Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="skchap" class="chapter">
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="skchap"></a>Kapitola 19. Slovak</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2866845">POZNÁMKA</a></h3>
+<h3 class="title">
+<a name="id2880023"></a>Poznámka</h3>
<p>
This paragraph would be in Slovak, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div id="svchap" class="chapter">
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="svchap"></a>Kapitel 20. Swedish</h2></div></div>
<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title"><a name="id2867184">NOT</a></h3>
+<h3 class="title">
+<a name="id2880362"></a>Not</h3>
<p>
This paragraph would be in Swedish, if I knew any.
&#x201C;Quote test.&#x201D;
</p>
</div>
<p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p>
-</div>
-<div class="bibliography">
-<h2 class="title"><a name="bibl">Bibliography</a></h2>
-<div id="id2867499" class="biblioentry">
-<a name="id2867499"></a><p>
-<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p>
+</div>
+<div id="bibl" class="bibliography">
+<div class="titlepage"><div><h2 class="title">
+<a name="bibl"></a>Bibliography</h2></div></div>
+<div id="id2880677" class="biblioentry">
+<a name="id2880677"></a><p>
+<span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span>
</p>
</div>
</div>
diff --git a/tests/docbook/result/html/qa.html b/tests/docbook/result/html/qa.html
index b046f34f..7ec49b6c 100644
--- a/tests/docbook/result/html/qa.html
+++ b/tests/docbook/result/html/qa.html
@@ -3,86 +3,91 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>book title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2750960">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2763166">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2750960"></a>book title</h1></div>
+<a name="id2763166"></a>book title</h1></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt>1. <a href="#id2799258">chapter test</a>
+<dt>1 <a href="#id2812423">chapter test</a>
</dt>
-<dd><dl><dt> <a href="#id2754178">Section title</a>
+<dd><dl><dt> <a href="#id2767352">Section title</a>
</dt></dl></dd>
-<dt>A. <a href="#id2753069">appendix test</a>
+<dt>A <a href="#id2766236">appendix test</a>
</dt>
-<dd><dl><dt> <a href="#id2863328">Section title</a>
+<dd><dl><dt> <a href="#id2876494">Section title</a>
</dt></dl></dd>
</dl>
</div>
-<div id="id2799258" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799258"></a>Chapter 1. chapter test</h2></div></div>
+<a name="id2812423"></a>Chapter 1. chapter test</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt> <a href="#id2754178">Section title</a>
+<dl><dt> <a href="#id2767352">Section title</a>
</dt></dl>
</div>
<div class="qandaset">
<h2 class="title">Q&amp;A Set (unspecified)</h2>
<dl>
-<dt>1.1. <a href="#id2755602">Q&amp;A Div 1</a>
+<dt>1.1 <a href="#id2769491">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.1.Q1. <a href="#id2755611">Question para 1</a>
+<dd><dl><dt>1.Q1 <a href="#id2769504">Question para 1</a>
</dt></dl></dd>
-<dt>1.2. <a href="#id2755677">Q&amp;A Div 2</a>
+<dt>1.2 <a href="#id2769566">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2755687">Question para 1</a>
+<dt> <a href="#id2769581">Question para 1</a>
</dt>
-<dt> <a href="#id2755741">Question para 1</a>
+<dt> <a href="#id2769635">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2755602">1.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2769491"></a>1.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2755611"><b>1.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2769504"></a><b>1.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.1.A1. </b>Answer para 1</p>
+<a name="id2769533"></a><b>1.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2755677">1.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2769566"></a>1.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2755687"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2769581"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2769605"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2755741"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2769635"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2769659"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -91,54 +96,59 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (none)</h2>
<dl>
-<dt>1.1. <a href="#id2755823">Q&amp;A Div 1</a>
+<dt>1.1 <a href="#id2769712">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.1.Q1. <a href="#id2755833">Question para 1</a>
+<dd><dl><dt>1.Q1 <a href="#id2769728">Question para 1</a>
</dt></dl></dd>
-<dt>1.2. <a href="#id2862799">Q&amp;A Div 2</a>
+<dt>1.2 <a href="#id2875962">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2862810">Question para 1</a>
+<dt> <a href="#id2875978">Question para 1</a>
</dt>
-<dt> <a href="#id2799313">Question para 1</a>
+<dt> <a href="#id2812481">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2755823">1.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2769712"></a>1.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2755833"><b>1.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2769728"></a><b>1.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.1.A1. </b>Answer para 1</p>
+<a name="id2771213"></a><b>1.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2862799">1.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2875962"></a>1.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2862810"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2875978"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2812451"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2799313"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2812481"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2812512"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -147,54 +157,59 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (number)</h2>
<dl>
-<dt>1.1. <a href="#id2757331">Q&amp;A Div 1</a>
+<dt>1.1 <a href="#id2770997">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.1.Q1. <a href="#id2757341">Question para 1</a>
+<dd><dl><dt>1.Q1 <a href="#id2771012">Question para 1</a>
</dt></dl></dd>
-<dt>1.2. <a href="#id2799382">Q&amp;A Div 2</a>
+<dt>1.2 <a href="#id2771074">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>1.2.1. <a href="#id2753836">Question para 1</a>
+<dt>1.1 <a href="#id2767015">Question para 1</a>
</dt>
-<dt>1.2.2. <a href="#id2753890">Question para 1</a>
+<dt>1.2 <a href="#id2767069">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2757331">1.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2770997"></a>1.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2757341"><b>1.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2771012"></a><b>1.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.1.A1. </b>Answer para 1</p>
+<a name="id2771041"></a><b>1.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2799382">1.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2771074"></a>1.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753836"><b>1.2.1. </b>Question para 1</a></p>
+<p>
+<a name="id2767015"></a><b>1.1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2767038"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753890"><b>1.2.2. </b>Question para 1</a></p>
+<p>
+<a name="id2767069"></a><b>1.2 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2767092"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -203,114 +218,123 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (qanda)</h2>
<dl>
-<dt>1.1. <a href="#id2753976">Q&amp;A Div 1</a>
+<dt>1.1 <a href="#id2767150">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.1.Q1. <a href="#id2753986">Question para 1</a>
+<dd><dl><dt>1.Q1 <a href="#id2767166">Question para 1</a>
</dt></dl></dd>
-<dt>1.2. <a href="#id2754053">Q&amp;A Div 2</a>
+<dt>1.2 <a href="#id2767227">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>Q: <a href="#id2754063">Question para 1</a>
+<dt>Q: <a href="#id2767242">Question para 1</a>
</dt>
-<dt>Q: <a href="#id2754117">Question para 1</a>
+<dt>Q: <a href="#id2767296">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2753976">1.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2767150"></a>1.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753986"><b>1.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2767166"></a><b>1.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.1.A1. </b>Answer para 1</p>
+<a name="id2767194"></a><b>1.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2754053">1.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2767227"></a>1.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754063"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2767242"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2767266"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754117"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2767296"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2767320"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
</div>
<div class="section">
-<a name="id2754178"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2754178"></a><span class="title">Section title</span>
-</h2></div></div>
+<a name="id2767352"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767352"></a>Section title</h2></div></div>
<div class="qandaset">
<h3 class="title">Q&amp;A Set (unspecified)</h3>
<dl>
-<dt>1. <a href="#id2754202">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2767377">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2754213">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2767392">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2754279">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2767454">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2754290">Question para 1</a>
+<dt> <a href="#id2767469">Question para 1</a>
</dt>
-<dt> <a href="#id2754344">Question para 1</a>
+<dt> <a href="#id2767523">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2754202">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2767377"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754213"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2767392"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2767420"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2754279">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2767454"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754290"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2767469"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2767492"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754344"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2767523"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2767546"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -319,54 +343,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (none)</h3>
<dl>
-<dt>1. <a href="#id2754429">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2767604">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2754440">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2767619">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2752485">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2765652">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2752495">Question para 1</a>
+<dt> <a href="#id2765667">Question para 1</a>
</dt>
-<dt> <a href="#id2752549">Question para 1</a>
+<dt> <a href="#id2765721">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2754429">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2767604"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2754440"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2767619"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2767124"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2752485">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2765652"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752495"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2765667"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2765691"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752549"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2765721"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2765745"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -375,54 +404,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (number)</h3>
<dl>
-<dt>1. <a href="#id2752635">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2765802">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2752646">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2765818">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2752712">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2765879">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>2.1. <a href="#id2752723">Question para 1</a>
+<dt>1 <a href="#id2765895">Question para 1</a>
</dt>
-<dt>2.2. <a href="#id2752777">Question para 1</a>
+<dt>2 <a href="#id2765949">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2752635">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2765802"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752646"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2765818"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2765846"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2752712">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2765879"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752723"><b>2.1. </b>Question para 1</a></p>
+<p>
+<a name="id2765895"></a><b>1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2765918"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752777"><b>2.2. </b>Question para 1</a></p>
+<p>
+<a name="id2765949"></a><b>2 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2765972"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -431,54 +465,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (qanda)</h3>
<dl>
-<dt>1. <a href="#id2752863">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2766030">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2752874">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2766046">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2752940">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2766107">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>Q: <a href="#id2752951">Question para 1</a>
+<dt>Q: <a href="#id2766123">Question para 1</a>
</dt>
-<dt>Q: <a href="#id2753005">Question para 1</a>
+<dt>Q: <a href="#id2766177">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2752863">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2766030"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752874"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2766046"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2766074"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2752940">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2766107"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2752951"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2766123"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2766146"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753005"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2766177"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2766200"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -486,65 +525,70 @@
</div>
</div>
</div>
-<div id="id2753069" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2753069"></a>Appendix A. appendix test</h2></div></div>
+<a name="id2766236"></a>Appendix A. appendix test</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt> <a href="#id2863328">Section title</a>
+<dl><dt> <a href="#id2876494">Section title</a>
</dt></dl>
</div>
<div class="qandaset">
<h2 class="title">Q&amp;A Set (unspecified)</h2>
<dl>
-<dt>A.1. <a href="#id2753093">Q&amp;A Div 1</a>
+<dt>A.1 <a href="#id2766260">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>A.1.Q1. <a href="#id2753104">Question para 1</a>
+<dd><dl><dt>A.Q1 <a href="#id2766276">Question para 1</a>
</dt></dl></dd>
-<dt>A.2. <a href="#id2753170">Q&amp;A Div 2</a>
+<dt>A.2 <a href="#id2766337">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2753180">Question para 1</a>
+<dt> <a href="#id2766352">Question para 1</a>
</dt>
-<dt> <a href="#id2753234">Question para 1</a>
+<dt> <a href="#id2766406">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2753093">A.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2766260"></a>A.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753104"><b>A.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2766276"></a><b>A.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A.1.A1. </b>Answer para 1</p>
+<a name="id2766304"></a><b>A.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2753170">A.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2766337"></a>A.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753180"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2766352"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766376"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753234"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2766406"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766430"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -553,54 +597,59 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (none)</h2>
<dl>
-<dt>A.1. <a href="#id2753320">Q&amp;A Div 1</a>
+<dt>A.1 <a href="#id2766487">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>A.1.Q1. <a href="#id2753331">Question para 1</a>
+<dd><dl><dt>A.Q1 <a href="#id2766503">Question para 1</a>
</dt></dl></dd>
-<dt>A.2. <a href="#id2753397">Q&amp;A Div 2</a>
+<dt>A.2 <a href="#id2766564">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2753408">Question para 1</a>
+<dt> <a href="#id2766580">Question para 1</a>
</dt>
-<dt> <a href="#id2753462">Question para 1</a>
+<dt> <a href="#id2766634">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2753320">A.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2766487"></a>A.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753331"><b>A.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2766503"></a><b>A.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A.1.A1. </b>Answer para 1</p>
+<a name="id2766531"></a><b>A.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2753397">A.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2766564"></a>A.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753408"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2766580"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766603"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753462"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2766634"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766657"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -609,54 +658,59 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (number)</h2>
<dl>
-<dt>A.1. <a href="#id2753548">Q&amp;A Div 1</a>
+<dt>A.1 <a href="#id2766715">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>A.1.Q1. <a href="#id2753559">Question para 1</a>
+<dd><dl><dt>A.Q1 <a href="#id2766731">Question para 1</a>
</dt></dl></dd>
-<dt>A.2. <a href="#id2753625">Q&amp;A Div 2</a>
+<dt>A.2 <a href="#id2766792">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>A.2.1. <a href="#id2753636">Question para 1</a>
+<dt>A.1 <a href="#id2766808">Question para 1</a>
</dt>
-<dt>A.2.2. <a href="#id2753690">Question para 1</a>
+<dt>A.2 <a href="#id2766862">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2753548">A.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2766715"></a>A.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753559"><b>A.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2766731"></a><b>A.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A.1.A1. </b>Answer para 1</p>
+<a name="id2766759"></a><b>A.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2753625">A.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2766792"></a>A.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753636"><b>A.2.1. </b>Question para 1</a></p>
+<p>
+<a name="id2766808"></a><b>A.1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766831"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2753690"><b>A.2.2. </b>Question para 1</a></p>
+<p>
+<a name="id2766862"></a><b>A.2 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2765778"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -665,114 +719,123 @@
<div class="qandaset">
<h2 class="title">Q&amp;A Set (qanda)</h2>
<dl>
-<dt>A.1. <a href="#id2863127">Q&amp;A Div 1</a>
+<dt>A.1 <a href="#id2876293">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>A.1.Q1. <a href="#id2863137">Question para 1</a>
+<dd><dl><dt>A.Q1 <a href="#id2876308">Question para 1</a>
</dt></dl></dd>
-<dt>A.2. <a href="#id2863204">Q&amp;A Div 2</a>
+<dt>A.2 <a href="#id2876370">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>Q: <a href="#id2863214">Question para 1</a>
+<dt>Q: <a href="#id2876385">Question para 1</a>
</dt>
-<dt>Q: <a href="#id2863268">Question para 1</a>
+<dt>Q: <a href="#id2876439">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2863127">A.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2876293"></a>A.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863137"><b>A.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2876308"></a><b>A.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A.1.A1. </b>Answer para 1</p>
+<a name="id2876337"></a><b>A.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2863204">A.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2876370"></a>A.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863214"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2876385"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2876409"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863268"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2876439"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2876463"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
</div>
<div class="section">
-<a name="id2863328"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2863328"></a><span class="title">Section title</span>
-</h2></div></div>
+<a name="id2876494"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2876494"></a>Section title</h2></div></div>
<div class="qandaset">
<h3 class="title">Q&amp;A Set (unspecified)</h3>
<dl>
-<dt>1. <a href="#id2863353">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2876519">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2863363">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2876534">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2863430">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2876596">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2863440">Question para 1</a>
+<dt> <a href="#id2876611">Question para 1</a>
</dt>
-<dt> <a href="#id2863494">Question para 1</a>
+<dt> <a href="#id2876665">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2863353">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2876519"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863363"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2876534"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2876562"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2863430">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2876596"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863440"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2876611"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2876634"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863494"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2876665"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2876688"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -781,54 +844,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (none)</h3>
<dl>
-<dt>1. <a href="#id2863572">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2876738">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2863582">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2876754">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2863649">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2876815">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2863659">Question para 1</a>
+<dt> <a href="#id2876830">Question para 1</a>
</dt>
-<dt> <a href="#id2863713">Question para 1</a>
+<dt> <a href="#id2876884">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2863572">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2876738"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863582"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2876754"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2876782"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2863649">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2876815"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863659"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2876830"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2876854"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863713"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2876884"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2876908"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -837,54 +905,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (number)</h3>
<dl>
-<dt>1. <a href="#id2863792">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2876958">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2863802">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2876973">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2863868">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2877035">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>2.1. <a href="#id2863879">Question para 1</a>
+<dt>1 <a href="#id2877050">Question para 1</a>
</dt>
-<dt>2.2. <a href="#id2863933">Question para 1</a>
+<dt>2 <a href="#id2877104">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2863792">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2876958"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863802"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2876973"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2877001"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2863868">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2877035"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863879"><b>2.1. </b>Question para 1</a></p>
+<p>
+<a name="id2877050"></a><b>1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2877073"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2863933"><b>2.2. </b>Question para 1</a></p>
+<p>
+<a name="id2877104"></a><b>2 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2877127"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
@@ -893,54 +966,59 @@
<div class="qandaset">
<h3 class="title">Q&amp;A Set (qanda)</h3>
<dl>
-<dt>1. <a href="#id2864011">Q&amp;A Div 1</a>
+<dt>1 <a href="#id2877177">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.Q1. <a href="#id2864021">Question para 1</a>
+<dd><dl><dt>Q1 <a href="#id2877193">Question para 1</a>
</dt></dl></dd>
-<dt>2. <a href="#id2864088">Q&amp;A Div 2</a>
+<dt>2 <a href="#id2877254">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt>Q: <a href="#id2864098">Question para 1</a>
+<dt>Q: <a href="#id2877270">Question para 1</a>
</dt>
-<dt>Q: <a href="#id2864152">Question para 1</a>
+<dt>Q: <a href="#id2877324">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h4 class="title"><a name="id2864011">1. Q&amp;A Div 1</a></h4>
+<h4 class="title">
+<a name="id2877177"></a>1 Q&amp;A Div 1</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2864021"><b>1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="id2877193"></a><b>Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.A1. </b>Answer para 1</p>
+<a name="id2877221"></a><b>A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h4 class="title"><a name="id2864088">2. Q&amp;A Div 2</a></h4>
+<h4 class="title">
+<a name="id2877254"></a>2 Q&amp;A Div 2</h4>
<div class="qandaentry">
<div class="question">
-<p><a name="id2864098"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2877270"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2877293"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2864152"><b>Q: </b>Question para 1</a></p>
+<p>
+<a name="id2877324"></a><b>Q: </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>A: </b>Answer para 1</p>
+<a name="id2877347"></a><b>A: </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
diff --git a/tests/docbook/result/html/qa2.html b/tests/docbook/result/html/qa2.html
index a2a0ea28..07446647 100644
--- a/tests/docbook/result/html/qa2.html
+++ b/tests/docbook/result/html/qa2.html
@@ -3,75 +3,80 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>book title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599532">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2764244">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2599532"></a>book title</h1></div>
+<a name="id2764244"></a>book title</h1></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt>1. <a href="#id2760466">chapter test</a>
+<dl><dt>1 <a href="#id2767141">chapter test</a>
</dt></dl>
</div>
-<div id="id2760466" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2760466"></a>Chapter 1. chapter test</h2></div></div>
-<p>Test a cross reference to a question: <a href="#q1">Q: 1.1.Q1.</a>.
+<a name="id2767141"></a>Chapter 1. chapter test</h2></div></div>
+<p>Test a cross reference to a question: <a href="#q1" title="">Q: 1.Q1</a>.
</p>
<div class="qandaset">
<h2 class="title">Q&amp;A Set (unspecified)</h2>
<dl>
-<dt>1.1. <a href="#id2757915">Q&amp;A Div 1</a>
+<dt>1.1 <a href="#id2771091">Q&amp;A Div 1</a>
</dt>
-<dd><dl><dt>1.1.Q1. <a href="#id2757927">Question para 1</a>
+<dd><dl><dt>1.Q1 <a href="#q1">Question para 1</a>
</dt></dl></dd>
-<dt>1.2. <a href="#id2758118">Q&amp;A Div 2</a>
+<dt>1.2 <a href="#id2771294">Q&amp;A Div 2</a>
</dt>
<dd><dl>
-<dt> <a href="#id2758130">Question para 1</a>
+<dt> <a href="#id2771312">Question para 1</a>
</dt>
-<dt> <a href="#id2848450">Question para 1</a>
+<dt> <a href="#id2766850">Question para 1</a>
</dt>
</dl></dd>
</dl>
<div class="qandadiv">
-<h3 class="title"><a name="id2757915">1.1. Q&amp;A Div 1</a></h3>
+<h3 class="title">
+<a name="id2771091"></a>1.1 Q&amp;A Div 1</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2757927"><b>1.1.Q1. </b>Question para 1</a></p>
+<p>
+<a name="q1"></a><b>1.Q1 </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b>1.1.A1. </b>Answer para 1</p>
+<a name="a1"></a><b>1.A1 </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
</div>
<div class="qandadiv">
-<h3 class="title"><a name="id2758118">1.2. Q&amp;A Div 2</a></h3>
+<h3 class="title">
+<a name="id2771294"></a>1.2 Q&amp;A Div 2</h3>
<div class="qandaentry">
<div class="question">
-<p><a name="id2758130"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2771312"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2771336"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
<div class="qandaentry">
<div class="question">
-<p><a name="id2848450"><b> </b>Question para 1</a></p>
+<p>
+<a name="id2766850"></a><b> </b>Question para 1</p>
<p>Question para 2</p>
</div>
<div class="answer">
<p>
-<b> </b>Answer para 1</p>
+<a name="id2766874"></a><b> </b>Answer para 1</p>
<p>Answer para 2</p>
</div>
</div>
diff --git a/tests/docbook/result/html/sectest.html b/tests/docbook/result/html/sectest.html
index a4c67a21..13789286 100644
--- a/tests/docbook/result/html/sectest.html
+++ b/tests/docbook/result/html/sectest.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -11,7 +11,7 @@
<a name="book"></a>Book Title</h1></div>
<div><h3 class="corpauthor">Some Corporation</h3></div>
<div><h3 class="author">Norman Walsh</h3></div>
-<div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div>
+<div><p class="copyright">Copyright © 1998 Norman Walsh</p></div>
<div><div class="legalnotice">
<p class="legalnotice-title"><b>Legal Notice</b></p>
<p>This is a test document. You can do what you will with it.</p>
@@ -27,9 +27,9 @@
</p></div></div>
<hr>
</div>
-<div id="id2751398" class="dedication">
+<div id="id2600532" class="dedication">
<div class="titlepage"><div><h2 class="title">
-<a name="id2751398"></a>Dedication</h2></div></div>
+<a name="id2600532"></a>Dedication</h2></div></div>
<p>This test book is dedicated to all the testers. This is the first para
of the dedication.</p>
<p>This is the second para of the dedication.</p>
@@ -38,42 +38,42 @@ of the dedication.</p>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2862712">Preface Title</a>
+<dt> <a href="#id2875909">Preface Title</a>
</dt>
-<dt>1. <a href="#chapter">XRef Tests</a>
+<dt>1 <a href="#chapter">XRef Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2753876">Section 1 Title</a>
+<dt> <a href="#id2767097">Section 1 Title</a>
</dt>
-<dt> <a href="#id2753202">Section 1 Title</a>
+<dt> <a href="#id2766430">Section 1 Title</a>
</dt>
</dl></dd>
</dl>
</div>
-<div id="id2862712" class="preface">
+<div id="id2875909" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2862712"></a>Preface Title</h2></div></div>
+<a name="id2875909"></a>Preface Title</h2></div></div>
<p>Preface content.</p>
<p>This is the second para of the preface.</p>
<p>This is the third para of the preface.</p>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. XRef Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2753876">Section 1 Title</a>
+<dt> <a href="#id2767097">Section 1 Title</a>
</dt>
-<dt> <a href="#id2753202">Section 1 Title</a>
+<dt> <a href="#id2766430">Section 1 Title</a>
</dt>
</dl>
</div>
-<h3>Xrefs</h3>
+<h4>Xrefs</h4>
<table class="simplelist" border="0" summary="Simple list">
-<tr><td><a href="#book"><i>Book Title</i></a></td></tr>
+<tr><td><a href="#book" title="Book Title">Book Title</a></td></tr>
<tr><td>???</td></tr>
-<tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr>
+<tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr>
<tr><td>???</td></tr>
<tr><td>???</td></tr>
<tr><td>???</td></tr>
@@ -145,9 +145,8 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
</p>
<div class="section">
-<a name="id2753876"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753876"></a><span class="title">Section 1 Title</span>
-</h2></div></div>
+<a name="id2767097"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2767097"></a>Section 1 Title</h2></div></div>
<p>blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
@@ -618,9 +617,8 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
</p>
</div>
<div class="section">
-<a name="id2753202"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2753202"></a><span class="title">Section 1 Title</span>
-</h2></div></div>
+<a name="id2766430"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2766430"></a>Section 1 Title</h2></div></div>
<p>blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
diff --git a/tests/docbook/result/html/set.html b/tests/docbook/result/html/set.html
index c5e37515..3f903f43 100644
--- a/tests/docbook/result/html/set.html
+++ b/tests/docbook/result/html/set.html
@@ -3,67 +3,67 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Set Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="set" id="id2799108">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="set" id="id2770357">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799108"></a>Set Title</h1></div>
+<a name="id2770357"></a>Set Title</h1></div>
<hr>
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2799117">Book Test Document Title</a>
+<dt> <a href="#id2770364">Book Test Document Title</a>
</dt>
<dd><dl>
-<dt> <a href="#id2799176">Foreword</a>
+<dt> <a href="#id2770423">Foreword</a>
</dt>
-<dt>1. <a href="#chapter">Section Tests</a>
+<dt>1 <a href="#chapter">Section Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2757308">First Sect1</a>
+<dt> <a href="#id2600533">First Sect1</a>
</dt>
-<dt> <a href="#id2757329">Second Sect1</a>
+<dt> <a href="#id2875810">Second Sect1</a>
</dt>
-<dt> <a href="#id2757350">Third Sect1</a>
+<dt> <a href="#id2875847">Third Sect1</a>
</dt>
</dl></dd>
-<dt>A. <a href="#id2757373">First Appendix</a>
+<dt>A <a href="#id2875870">First Appendix</a>
</dt>
<dd><dl>
-<dt> <a href="#id2757391">First Sect1</a>
+<dt> <a href="#id2812410">First Sect1</a>
</dt>
-<dt> <a href="#id2757283">Second Sect1</a>
+<dt> <a href="#id2812431">Second Sect1</a>
</dt>
-<dt> <a href="#id2862668">Third Sect1</a>
+<dt> <a href="#id2812452">Third Sect1</a>
</dt>
</dl></dd>
</dl></dd>
-<dt> <a href="#id2799192">Book Test Document Title</a>
+<dt> <a href="#id2812331">Book Test Document Title</a>
</dt>
<dd><dl>
-<dt> <a href="#id2799252">Foreword</a>
+<dt> <a href="#id2768584">Foreword</a>
</dt>
-<dt>1. <a href="#id2755411">Section Tests</a>
+<dt>1 <a href="#id2768607">Section Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2755425">First Sect1</a>
+<dt> <a href="#id2768621">First Sect1</a>
</dt>
-<dt> <a href="#id2755446">Second Sect1</a>
+<dt> <a href="#id2768642">Second Sect1</a>
</dt>
-<dt> <a href="#id2755467">Third Sect1</a>
+<dt> <a href="#id2768663">Third Sect1</a>
</dt>
</dl></dd>
-<dt>A. <a href="#id2755490">First Appendix</a>
+<dt>A <a href="#id2768686">First Appendix</a>
</dt>
</dl></dd>
</dl>
</div>
-<div class="book" id="id2799117">
+<div class="book" id="id2770364">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799117"></a>Book Test Document Title</h1></div>
+<a name="id2770364"></a>Bookinfo Test Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
<hr>
@@ -71,107 +71,101 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2799176">Foreword</a>
+<dt> <a href="#id2770423">Foreword</a>
</dt>
-<dt>1. <a href="#chapter">Section Tests</a>
+<dt>1 <a href="#chapter">Section Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2757308">First Sect1</a>
+<dt> <a href="#id2600533">First Sect1</a>
</dt>
-<dt> <a href="#id2757329">Second Sect1</a>
+<dt> <a href="#id2875810">Second Sect1</a>
</dt>
-<dt> <a href="#id2757350">Third Sect1</a>
+<dt> <a href="#id2875847">Third Sect1</a>
</dt>
</dl></dd>
-<dt>A. <a href="#id2757373">First Appendix</a>
+<dt>A <a href="#id2875870">First Appendix</a>
</dt>
<dd><dl>
-<dt> <a href="#id2757391">First Sect1</a>
+<dt> <a href="#id2812410">First Sect1</a>
</dt>
-<dt> <a href="#id2757283">Second Sect1</a>
+<dt> <a href="#id2812431">Second Sect1</a>
</dt>
-<dt> <a href="#id2862668">Third Sect1</a>
+<dt> <a href="#id2812452">Third Sect1</a>
</dt>
</dl></dd>
</dl>
</div>
-<div id="id2799176" class="preface">
+<div id="id2770423" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799176"></a>Foreword</h2></div></div>
+<a name="id2770423"></a>Foreword</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="chapter" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="chapter"></a>Chapter 1. Section Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2757308">First Sect1</a>
+<dt> <a href="#id2600533">First Sect1</a>
</dt>
-<dt> <a href="#id2757329">Second Sect1</a>
+<dt> <a href="#id2875810">Second Sect1</a>
</dt>
-<dt> <a href="#id2757350">Third Sect1</a>
+<dt> <a href="#id2875847">Third Sect1</a>
</dt>
</dl>
</div>
<div class="sect1">
-<a name="id2757308"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2757308"></a><span class="title">First Sect1</span>
-</h2></div></div>
+<a name="id2600533"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2600533"></a>First Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2757329"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2757329"></a><span class="title">Second Sect1</span>
-</h2></div></div>
+<a name="id2875810"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2875810"></a>Second Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2757350"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2757350"></a><span class="title">Third Sect1</span>
-</h2></div></div>
+<a name="id2875847"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2875847"></a>Third Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
</div>
-<div id="id2757373" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2757373"></a>Appendix A. First Appendix</h2></div></div>
+<a name="id2875870"></a>Appendix A. First Appendix</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2757391">First Sect1</a>
+<dt> <a href="#id2812410">First Sect1</a>
</dt>
-<dt> <a href="#id2757283">Second Sect1</a>
+<dt> <a href="#id2812431">Second Sect1</a>
</dt>
-<dt> <a href="#id2862668">Third Sect1</a>
+<dt> <a href="#id2812452">Third Sect1</a>
</dt>
</dl>
</div>
<p>This is just a test.</p>
<div class="sect1">
-<a name="id2757391"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2757391"></a><span class="title">First Sect1</span>
-</h2></div></div>
+<a name="id2812410"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2812410"></a>First Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2757283"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2757283"></a><span class="title">Second Sect1</span>
-</h2></div></div>
+<a name="id2812431"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2812431"></a>Second Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2862668"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2862668"></a><span class="title">Third Sect1</span>
-</h2></div></div>
+<a name="id2812452"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2812452"></a>Third Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
</div>
</div>
-<div class="book" id="id2799192">
+<div class="book" id="id2812331">
<div class="titlepage">
<div><h1 class="title">
-<a name="id2799192"></a>Book Test Document Title</h1></div>
+<a name="id2812331"></a>Bookinfo Test Document Title</h1></div>
<div><h2 class="subtitle">Book Subtitle</h2></div>
<div><h3 class="author">Norman Walsh</h3></div>
<hr>
@@ -179,63 +173,60 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2799252">Foreword</a>
+<dt> <a href="#id2768584">Foreword</a>
</dt>
-<dt>1. <a href="#id2755411">Section Tests</a>
+<dt>1 <a href="#id2768607">Section Tests</a>
</dt>
<dd><dl>
-<dt> <a href="#id2755425">First Sect1</a>
+<dt> <a href="#id2768621">First Sect1</a>
</dt>
-<dt> <a href="#id2755446">Second Sect1</a>
+<dt> <a href="#id2768642">Second Sect1</a>
</dt>
-<dt> <a href="#id2755467">Third Sect1</a>
+<dt> <a href="#id2768663">Third Sect1</a>
</dt>
</dl></dd>
-<dt>A. <a href="#id2755490">First Appendix</a>
+<dt>A <a href="#id2768686">First Appendix</a>
</dt>
</dl>
</div>
-<div id="id2799252" class="preface">
+<div id="id2768584" class="preface">
<div class="titlepage"><div><h2 class="title">
-<a name="id2799252"></a>Foreword</h2></div></div>
+<a name="id2768584"></a>Foreword</h2></div></div>
<p>This is a test paragraph.</p>
</div>
-<div id="id2755411" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755411"></a>Chapter 1. Section Tests</h2></div></div>
+<a name="id2768607"></a>Chapter 1. Section Tests</h2></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
-<dt> <a href="#id2755425">First Sect1</a>
+<dt> <a href="#id2768621">First Sect1</a>
</dt>
-<dt> <a href="#id2755446">Second Sect1</a>
+<dt> <a href="#id2768642">Second Sect1</a>
</dt>
-<dt> <a href="#id2755467">Third Sect1</a>
+<dt> <a href="#id2768663">Third Sect1</a>
</dt>
</dl>
</div>
<div class="sect1">
-<a name="id2755425"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755425"></a><span class="title">First Sect1</span>
-</h2></div></div>
+<a name="id2768621"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2768621"></a>First Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2755446"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755446"></a><span class="title">Second Sect1</span>
-</h2></div></div>
+<a name="id2768642"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2768642"></a>Second Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
<div class="sect1">
-<a name="id2755467"></a><div class="titlepage"><div><h2 class="title" style="clear: all">
-<a name="id2755467"></a><span class="title">Third Sect1</span>
-</h2></div></div>
+<a name="id2768663"></a><div class="titlepage"><div><h2 class="title" style="clear: both">
+<a name="id2768663"></a>Third Sect1</h2></div></div>
<p>Paragraph.</p>
</div>
</div>
-<div id="id2755490" class="appendix">
+<div class="appendix">
<div class="titlepage"><div><h2 class="title">
-<a name="id2755490"></a>Appendix A. First Appendix</h2></div></div>
+<a name="id2768686"></a>Appendix A. First Appendix</h2></div></div>
<p>This is just a test.</p>
</div>
</div>
diff --git a/tests/docbook/result/html/table.html b/tests/docbook/result/html/table.html
index fada2126..0018502b 100644
--- a/tests/docbook/result/html/table.html
+++ b/tests/docbook/result/html/table.html
@@ -3,15 +3,15 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Chapter 1. test</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="ch1" class="chapter">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ch1"></a>Chapter 1. test</h2></div></div>
<p>How many ° can you ©.</p>
<div class="table">
<p>
-<a name="id2755502"></a><b>Table 1.1. A Table</b>
+<a name="id2768691"></a><b>Table 1.1. A Table</b>
</p>
<table summary="A Table" border="1">
<colgroup>
@@ -54,7 +54,6 @@
<td>3</td>
</tr>
<tr>
-<td> </td>
<td>2</td>
<td>3</td>
</tr>
@@ -63,10 +62,7 @@
<td>2</td>
<td>3</td>
</tr>
-<tr>
-<td> </td>
-<td colspan="2">2</td>
-</tr>
+<tr><td colspan="2">2</td></tr>
<tr>
<td>1</td>
<td>2</td>
@@ -77,7 +73,7 @@
</div>
<div class="table">
<p>
-<a name="id2799237"></a><b>Table 1.2. A Table</b>
+<a name="id2812434"></a><b>Table 1.2. A Table</b>
</p>
<table summary="A Table" border="1" width="4in">
<colgroup>
@@ -120,7 +116,6 @@
<td>3</td>
</tr>
<tr>
-<td> </td>
<td>2</td>
<td>3</td>
</tr>
@@ -129,10 +124,7 @@
<td>2</td>
<td>3</td>
</tr>
-<tr>
-<td> </td>
-<td colspan="2">2</td>
-</tr>
+<tr><td colspan="2">2</td></tr>
<tr>
<td>1</td>
<td>2</td>
@@ -143,7 +135,7 @@
</div>
<div class="table">
<p>
-<a name="id2753700"></a><b>Table 1.3. A Table</b>
+<a name="id2766904"></a><b>Table 1.3. A Table</b>
</p>
<table summary="A Table" border="1" width="7in">
<colgroup>
@@ -186,7 +178,6 @@
<td>3</td>
</tr>
<tr>
-<td> </td>
<td>2</td>
<td>3</td>
</tr>
@@ -195,10 +186,7 @@
<td>2</td>
<td>3</td>
</tr>
-<tr>
-<td> </td>
-<td colspan="2">2</td>
-</tr>
+<tr><td colspan="2">2</td></tr>
<tr>
<td>1</td>
<td>2</td>
@@ -209,7 +197,7 @@
</div>
<div class="table">
<p>
-<a name="id2754121"></a><b>Table 1.4. A Table</b>
+<a name="id2767276"></a><b>Table 1.4. A Table</b>
</p>
<table summary="A Table" border="1" width="85%">
<colgroup>
@@ -252,7 +240,6 @@
<td>3</td>
</tr>
<tr>
-<td> </td>
<td>2</td>
<td>3</td>
</tr>
@@ -261,10 +248,7 @@
<td>2</td>
<td>3</td>
</tr>
-<tr>
-<td> </td>
-<td colspan="2">2</td>
-</tr>
+<tr><td colspan="2">2</td></tr>
<tr>
<td>1</td>
<td>2</td>
diff --git a/tests/docbook/result/html/test.html b/tests/docbook/result/html/test.html
index b4756fe7..add4d001 100644
--- a/tests/docbook/result/html/test.html
+++ b/tests/docbook/result/html/test.html
@@ -3,13 +3,13 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Article Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
<meta name="keywords" content="keyword1, keyword2, keyword3">
</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599532" class="article">
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article">
<div class="titlepage">
-<div><h1 class="title">
-<a name="id2599532"></a>Article Title</h1></div>
+<div><h2 class="title">
+<a name="id2767133"></a>Article Title</h2></div>
<hr>
</div>
<pre class="screen">This
@@ -24,7 +24,7 @@ This
is With a line-annotation
a
screen</pre>
-<p>What about <a href="#foo"><img src="../images/callouts/1.png" alt="1" border="0"></a>?</p>
+<p>What about <a href="#foo" title=""><img src="../images/callouts/1.png" alt="1" border="0"></a>?</p>
<div class="mediaobjectco"><img src="http://maps.example.com/EARTH?USA?MA?AMHERST"></div>
</div></body>
</html>
diff --git a/tests/docbook/result/html/verbtest.html b/tests/docbook/result/html/verbtest.html
index 7b24a17d..e19b5a8f 100644
--- a/tests/docbook/result/html/verbtest.html
+++ b/tests/docbook/result/html/verbtest.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
<title>Book Title</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.29">
+<meta name="generator" content="DocBook XSL Stylesheets V1.40">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book">
<div class="titlepage">
@@ -13,14 +13,14 @@
</div>
<div class="toc">
<p><b>Table of Contents</b></p>
-<dl><dt>1. <a href="#ch1">test</a>
+<dl><dt>1 <a href="#ch1">test</a>
</dt></dl>
</div>
-<div id="ch1" class="chapter">
+<div class="chapter">
<div class="titlepage"><div><h2 class="title">
<a name="ch1"></a>Chapter 1. test</h2></div></div>
<p>How many ° can you ©.</p>
-<p>And what about <a href="#ch1">Chapter 1., <i>test</i></a>.</p>
+<p>And what about <a href="#ch1" title="Chapter 1. test">Chapter 1. test</a>.</p>
<p>And what about ???.</p>
<pre class="programlisting">
This is a program
diff --git a/tests/docbook/result/xhtml/article.xhtml b/tests/docbook/result/xhtml/article.xhtml
index f9ae4db1..dc85ac6e 100644
--- a/tests/docbook/result/xhtml/article.xhtml
+++ b/tests/docbook/result/xhtml/article.xhtml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2765506" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2765506"/>Article Test Document Title</h1></div><div><h3 class="corpauthor">nwalsh</h3><h3 class="author">Norman Walsh</h3><h3 class="othercredit">Other Credit</h3><h4 class="editedby">Edited by</h4><h3 class="editor">Someother Editor</h3><h3 class="author">Someone Else</h3></div><div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2753707"/><b>Abstract</b></p><p>This article is just a test. This article is just a test.
+<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2599781"/>Article Test Document Title</h2></div><div><h3 class="corpauthor">nwalsh</h3><h3 class="author">Norman Walsh</h3><h3 class="othercredit">Other Credit</h3><h4 class="editedby">Edited by</h4><h3 class="editor">Someother Editor</h3><h3 class="author">Someone Else</h3></div><div><p class="copyright">Copyright © 1999 Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2766983"/><b>Abstract</b></p><p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2752882">First level section</a></dt><dd><dl><dt> <a href="#id2752894">Second level section</a></dt></dl></dd></dl></div><p>
+</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2766159">First level section</a></dt><dd><dl><dt> <a href="#id2766171">Second level section</a></dt></dl></dd><dt>A <a href="#id2766284">Appendix</a></dt></dl></div><p>
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</p><div class="literallayout">This is a <i>literal layout</i><br/>
  It'll be a &lt;pre&gt; until the <tt>chunk.pl</tt><br/>
script    fixes   things    up.</div><p>This article is just a test. This article is just a test.
@@ -18,19 +18,19 @@ This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
</p><div class="figure"><p><a name="testfig"/><b>Figure 1. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div><p>This para contains an xref to a figure: <a href="#testfig">Figure 1.</a>.
+</pre></div><p>This para contains an xref to a figure: <a href="#testfig" title="Figure 1. Test Figure">Figure 1. Test Figure</a>.
</p><div class="figure"><p><a name="testfig2"/><b>Figure 2. Test Figure2</b></p><pre class="programlisting">A Second
Test Figure
-</pre></div><p>This para contains an <a href="#testfig2">link</a> to a
+</pre></div><p>This para contains an <a href="#testfig2" title="Figure 2. Test Figure2">link</a> to a
figure.
-</p><div class="itemizedlist"><ul><li><p><a name="id2752797"/>Test item.</p></li><li><p><a name="id2752807"/>Test item.</p></li><li><p><a name="id2752818"/>Test item.</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2752836"/>Test item.</p></li><li><p><a name="id2752846"/>Test item.</p></li><li><p><a name="id2752857"/>Test item.</p></li></ol></div><p>This article is just a test. This article is just a test.
+</p><div class="itemizedlist"><ul><li><p><a name="id2766074"/>Test item.</p></li><li><p><a name="id2766085"/>Test item.</p></li><li><p><a name="id2766095"/>Test item.</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2766113"/>Test item.</p></li><li><p><a name="id2766124"/>Test item.</p></li><li><p><a name="id2766134"/>Test item.</p></li></ol></div><p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p><div class="section"><a name="id2752882"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2752882"/><span class="title">First level section</span></h2></div></div><div class="section"><a name="id2752894"/><div class="titlepage"><div><h3 class="title"><a name="id2752894"/><span class="title">Second level section</span></h3></div></div><div class="section"><a name="id2752905"/><div class="titlepage"><div><h4 class="title"><a name="id2752905"/><span class="title">Third level section</span></h4></div></div><div class="section"><a name="id2752917"/><div class="titlepage"><div><h5 class="title"><a name="id2752917"/><span class="title">Fourth level section</span></h5></div></div><div class="section"><a name="id2752928"/><div class="titlepage"><div><h6 class="title"><a name="id2752928"/><span class="title">Fifth level section (SI)</span></h6></div></div><div class="section"><a name="id2752959"/><div class="titlepage"><div><h6 class="title"><a name="id2752959"/><span class="title">Sixth level section</span></h6></div></div><div class="section"><a name="id2752970"/><div class="titlepage"><div><h6 class="title"><a name="id2752970"/><span class="title">Seventh level section</span></h6></div></div><p>This article is just a test. This article is just a test.
+</p><div class="section"><a name="id2766159"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766159"/>First level section</h2></div></div><div class="section"><a name="id2766171"/><div class="titlepage"><div><h3 class="title"><a name="id2766171"/>Second level section</h3></div></div><div class="section"><a name="id2766182"/><div class="titlepage"><div><h4 class="title"><a name="id2766182"/>Third level section</h4></div></div><div class="section"><a name="id2766194"/><div class="titlepage"><div><h5 class="title"><a name="id2766194"/>Fourth level section</h5></div></div><div class="section"><a name="id2766206"/><div class="titlepage"><div><h6 class="title"><a name="id2766212"/>Fifth level section (SI)</h6></div></div><div class="section"><a name="id2766236"/><div class="titlepage"><div><h6 class="title"><a name="id2766236"/>Sixth level section</h6></div></div><div class="section"><a name="id2766247"/><div class="titlepage"><div><h6 class="title"><a name="id2766247"/>Seventh level section</h6></div></div><p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p></div></div></div></div></div></div></div><div id="id2753007" class="appendix"><h2 class="title" style="clear: all"><a name="id2753007"/>Appendix A. Appendix</h2><p>This is just a test.</p></div></div></body></html>
+</p></div></div></div></div></div></div></div><div class="appendix"><h2 class="title" style="clear: both"><a name="id2766284"/>A. Appendix</h2><p>This is just a test.</p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/article2.xhtml b/tests/docbook/result/xhtml/article2.xhtml
index 6ebfdb82..81f88139 100644
--- a/tests/docbook/result/xhtml/article2.xhtml
+++ b/tests/docbook/result/xhtml/article2.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751127" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2751127"/>Article Test Document Title</h1></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2766257"/><b>Abstract</b></p><p>This article is just a test. This <i>article</i>
+<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2779384"/>Article Test Document Title</h2></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1999 Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2779507"/><b>Abstract</b></p><p>This article is just a test. This <i>article</i>
is just a test.
This <b><tt>article</tt></b> is just a test.
This <tt>&lt;<a href="mailto:ndw@nwalsh.com">ndw@nwalsh.com</a>&gt;</tt> is just a test.
@@ -13,4 +13,4 @@ This <tt>&lt;<a href="mailto:ndw@nwalsh.com">ndw@nwalsh.com</a>&gt;</tt> is just
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p><div class="table"><p><a name="id2753720"/><b>Table 1. This is a test table</b></p><table summary="This is a test table" border="1"><colgroup><col/><col align="right"/><col/></colgroup><thead><tr><th>Head1</th><th align="center">Head2</th><th>Head3</th></tr></thead><tbody><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr><tr><td>Entry1</td><td colspan="2" align="center">span 2-3</td></tr><tr><td>Entry1</td><td rowspan="3" valign="middle">morerows2</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry3</td></tr><tr><td colspan="3" align="center">fullspan</td></tr><tr align="center"><td>Entry1</td><td>Entry2</td><td align="left">Entry3</td></tr><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr></tbody></table></div><div class="variablelist"><dl><dt><a name="id2752605"/><span class="term">term</span></dt><dd><p><a name="id2752616"/>some text</p></dd><dt><a name="id2752633"/><span class="term">term2a, </span><span class="term">term2b</span></dt><dd><p><a name="id2752650"/>some text</p></dd><dt><a name="id2752667"/><span class="term">term3</span></dt><dd><p><a name="id2752678"/>some text</p><p>some text</p><p>some text</p></dd></dl></div></div></body></html>
+</p><div class="table"><p><a name="id2766998"/><b>Table 1. This is a test table</b></p><table summary="This is a test table" border="1"><colgroup><col/><col align="right"/><col/></colgroup><thead><tr><th>Head1</th><th align="center">Head2</th><th>Head3</th></tr></thead><tbody><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr><tr><td>Entry1</td><td colspan="2" align="center">span 2-3</td></tr><tr><td>Entry1</td><td rowspan="3" valign="middle">morerows2</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry3</td></tr><tr><td colspan="3" align="center">fullspan</td></tr><tr align="center"><td>Entry1</td><td>Entry2</td><td align="left">Entry3</td></tr><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr><tr><td>Entry1</td><td>Entry2</td><td>Entry3</td></tr></tbody></table></div><div class="variablelist"><dl><dt><a name="id2765889"/><span class="term">term</span></dt><dd><p><a name="id2765900"/>some text</p></dd><dt><a name="id2765918"/><span class="term">term2a, </span><span class="term">term2b</span></dt><dd><p><a name="id2765934"/>some text</p></dd><dt><a name="id2765951"/><span class="term">term3</span></dt><dd><p><a name="id2765963"/>some text</p><p>some text</p><p>some text</p></dd></dl></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/article3.xhtml b/tests/docbook/result/xhtml/article3.xhtml
index 1f362a79..8e08545a 100644
--- a/tests/docbook/result/xhtml/article3.xhtml
+++ b/tests/docbook/result/xhtml/article3.xhtml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751127" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2751127"/>Article Test Document Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2766138">First level section</a></dt><dd><dl><dt> <a href="#id2766148">Second level section</a></dt></dl></dd><dt> <a href="#id2753699">Another Section</a></dt><dt> <a href="#id2753734">Another Section</a></dt><dd><dl><dt> <a href="#id2753746">Another Section</a></dt></dl></dd><dt> <a href="#id2753782">Another Section</a></dt><dd><dl><dt> <a href="#id2752351">Another Section</a></dt></dl></dd></dl></div><p>This article is just a test. This article is just a test.
+<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2779384"/>Article Test Document Title</h2></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2779377">First level section</a></dt><dd><dl><dt> <a href="#id2779396">Second level section</a></dt></dl></dd><dt> <a href="#id2766976">Another Section</a></dt><dt> <a href="#id2767011">Another Section</a></dt><dd><dl><dt> <a href="#id2767022">Another Section</a></dt></dl></dd><dt> <a href="#id2767059">Another Section</a></dt><dd><dl><dt> <a href="#id2765628">Another Section</a></dt></dl></dd></dl></div><p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p><div class="section"><a name="id2766138"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2766138"/><span class="title">First level section</span></h2></div></div><div class="section"><a name="id2766148"/><div class="titlepage"><div><h3 class="title"><a name="id2766148"/><span class="title">Second level section</span></h3></div></div><div class="section"><a name="id2766158"/><div class="titlepage"><div><h4 class="title"><a name="id2766158"/><span class="title">Third level section</span></h4></div></div><div class="section"><a name="id2766262"/><div class="titlepage"><div><h5 class="title"><a name="id2766262"/><span class="title">Fourth level section</span></h5></div></div><div class="section"><a name="id2766274"/><div class="titlepage"><div><h6 class="title"><a name="id2766274"/><span class="title">Fifth level section</span></h6></div></div><p>This is just a test.</p></div></div></div></div></div><div class="section"><a name="id2753699"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2753699"/><span class="title">Another Section</span></h2></div></div><div class="simplesect"><a name="id2753711"/><div class="titlepage"><div><h3 class="title"><a name="id2753711"/><span class="title">SimpleSect @ level 2</span></h3></div></div><p>This is just a test.</p></div></div><div class="section"><a name="id2753734"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2753734"/><span class="title">Another Section</span></h2></div></div><div class="section"><a name="id2753746"/><div class="titlepage"><div><h3 class="title"><a name="id2753746"/><span class="title">Another Section</span></h3></div></div><div class="simplesect"><a name="id2753757"/><div class="titlepage"><div><h4 class="title"><a name="id2753757"/><span class="title">SimpleSect @ level 3</span></h4></div></div><p>This is just a test.</p></div></div></div><div class="section"><a name="id2753782"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2753782"/><span class="title">Another Section</span></h2></div></div><div class="section"><a name="id2752351"/><div class="titlepage"><div><h3 class="title"><a name="id2752351"/><span class="title">Another Section</span></h3></div></div><div class="section"><a name="id2752362"/><div class="titlepage"><div><h4 class="title"><a name="id2752362"/><span class="title">Another Section</span></h4></div></div><div class="simplesect"><a name="id2752374"/><div class="titlepage"><div><h5 class="title"><a name="id2752374"/><span class="title">SimpleSect @ level 4</span></h5></div></div><p>This is just a test.</p></div></div></div></div></div></body></html>
+</p><div class="section"><a name="id2779377"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2779377"/>First level section</h2></div></div><div class="section"><a name="id2779396"/><div class="titlepage"><div><h3 class="title"><a name="id2779396"/>Second level section</h3></div></div><div class="section"><a name="id2779407"/><div class="titlepage"><div><h4 class="title"><a name="id2779496"/>Third level section</h4></div></div><div class="section"><a name="id2779512"/><div class="titlepage"><div><h5 class="title"><a name="id2779512"/>Fourth level section</h5></div></div><div class="section"><a name="id2779523"/><div class="titlepage"><div><h6 class="title"><a name="id2766944"/>Fifth level section</h6></div></div><p>This is just a test.</p></div></div></div></div></div><div class="section"><a name="id2766976"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766976"/>Another Section</h2></div></div><div class="simplesect"><a name="id2766987"/><div class="titlepage"><div><h3 class="title"><a name="id2766987"/>SimpleSect @ level 2</h3></div></div><p>This is just a test.</p></div></div><div class="section"><a name="id2767011"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767011"/>Another Section</h2></div></div><div class="section"><a name="id2767022"/><div class="titlepage"><div><h3 class="title"><a name="id2767022"/>Another Section</h3></div></div><div class="simplesect"><a name="id2767034"/><div class="titlepage"><div><h4 class="title"><a name="id2767034"/>SimpleSect @ level 3</h4></div></div><p>This is just a test.</p></div></div></div><div class="section"><a name="id2767059"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767059"/>Another Section</h2></div></div><div class="section"><a name="id2765628"/><div class="titlepage"><div><h3 class="title"><a name="id2765628"/>Another Section</h3></div></div><div class="section"><a name="id2765640"/><div class="titlepage"><div><h4 class="title"><a name="id2765640"/>Another Section</h4></div></div><div class="simplesect"><a name="id2765651"/><div class="titlepage"><div><h5 class="title"><a name="id2765651"/>SimpleSect @ level 4</h5></div></div><p>This is just a test.</p></div></div></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/bib.xhtml b/tests/docbook/result/xhtml/bib.xhtml
index 59fefbeb..8dbfcf1d 100644
--- a/tests/docbook/result/xhtml/bib.xhtml
+++ b/tests/docbook/result/xhtml/bib.xhtml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Test Book</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Test Book</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#bib1">A Test Bibliography</a></dt></dl></div><div class="bibliography"><h2 class="title"><a name="bib1">A Test Bibliography</a></h2><p>The stock stylesheet attempts to do a Bibliography. It probably needs
-a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2753985">Books</a></h3><div id="id2753999" class="biblioentry"><a name="id2753999"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2799273">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
+<html><head><title>Test Book</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Test Book</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#bib1">A Test Bibliography</a></dt></dl></div><div id="bib1" class="bibliography"><div class="titlepage"><div><h2 class="title"><a name="bib1"/>A Test Bibliography</h2></div></div><p>The stock stylesheet attempts to do a Bibliography. It probably needs
+a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2770698">Books</a></h3><div id="id2770712" class="biblioentry"><a name="id2770712"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2812526">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
&#x201C;Introduction to Cascading Style Sheets&#x201D;.
</span>
<span class="bibliomset"> <I>The World Wide Web Journal</I>.
<span class="volumenum">2</span>(<span class="issuenum">1</span>).
<span class="publishername">O'Reilly &amp; Associates, Inc.</span> and
<span class="corpname">The World Wide Web Consortium</span>.
- <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2756408" class="biblioentry"><a name="id2756408"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
+ <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2768934" class="biblioentry"><a name="id2768934"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
Anywhere, XX 99999
diff --git a/tests/docbook/result/xhtml/book.xhtml b/tests/docbook/result/xhtml/book.xhtml
index dda73edf..5b7cc297 100644
--- a/tests/docbook/result/xhtml/book.xhtml
+++ b/tests/docbook/result/xhtml/book.xhtml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799237"><div class="titlepage"><div><h1 class="title"><a name="id2799237"/>Book Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3><h3 class="author">John Doe</h3></div><div><span class="releaseinfo">Some releaseinfo<br/></span></div><div><p class="copyright">Copyright © 2000 by Norman Walsh</p></div><div><div class="legalnotice"><p>Some legal notice. Some legal notice. Some legal notice.
+<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770548"><div class="titlepage"><div><h1 class="title"><a name="id2770548"/>Bookinfo Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3><h3 class="author">John Doe</h3></div><div><p class="releaseinfo">Some releaseinfo</p></div><div><p class="copyright">Copyright © 2000 Norman Walsh</p></div><div><div class="legalnotice"><p>Some legal notice. Some legal notice. Some legal notice.
Some legal notice. Some legal notice. Some legal notice.
Some legal notice. Some legal notice. Some legal notice.
Some legal notice. Some legal notice. Some legal notice.
-</p></div></div><div><p class="pubdate">16 December 2000</p></div><div><div class="abstract"><p><a name="id2862769"/><b>Abstract</b></p><p>Some abstract. Some abstract. Some abstract. Some abstract.
+</p></div></div><div><p class="pubdate">16 December 2000</p></div><div><div class="abstract"><p><a name="id2770669"/><b>Abstract</b></p><p>Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
@@ -11,7 +11,7 @@ Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
</p><p>Some abstract. Some abstract. Some abstract. Some abstract.
Some abstract. Some abstract. Some abstract. Some abstract.
-</p></div></div><hr/></div><div id="id2799360" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2799360"/>First Dedication</h2></div></div><p>Just a test. &#x201C;What about&#x2014;this?&#x201D;</p><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+</p></div></div><hr/></div><div id="id2876040" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2876040"/>First Dedication</h2></div></div><p>Just a test. &#x201C;What about&#x2014;this?&#x201D;</p><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah blah blah blah blah. Blah blah blah blah.
Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
Blah blah blah blah blah blah blah blah. Blah blah blah blah.
@@ -181,38 +181,38 @@ Blah blah blah blah blah blah blah blah. Blah blah blah blah.
Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
Blah blah blah blah blah blah blah blah. Blah blah blah blah.
Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-</p></div><div id="id2756361" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2756361"/>Dedication</h2></div></div><p>Just a test dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2756376">Foreword</a></dt><dt> <a href="#id2756407">Preface</a></dt><dt>I. <a href="#id2756423">Part One Title</a></dt><dt>2. <a href="#id2758090">First Chapter</a></dt><dt>3. <a href="#id2758168">Second Chapter</a></dt><dt>4. <a href="#id2758388">Third Chapter</a></dt><dt>A. <a href="#id2758409">First Appendix</a></dt><dt>B. <a href="#id2758044">Second Appendix</a></dt></dl></div><div id="id2756376" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2756376"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div id="id2756407" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2756407"/>Preface</h2></div></div><p>This is a test preface.</p></div><div class="part" id="id2756423"><div class="titlepage"><div><h1 class="title"><a name="id2756423"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2756468"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2756488" href="#ftn.id2756488">1</a>]</sup>.</p><div class="sect1"><a name="id2756504"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2756504"/><span class="title">PartIntro Section</span></h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2757945">First Sect1</a></dt><dt> <a href="#id2758005">Second Sect1</a></dt><dt> <a href="#id2758026">Third Sect1</a></dt></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2756488" href="#id2756488">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. Section <a name="stestfoo"/>Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2757945">First Sect1</a></dt><dt> <a href="#id2758005">Second Sect1</a></dt><dt> <a href="#id2758026">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2757945"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2757945"/><span class="title">First Sect1</span></h2></div></div><p>Paragraph.</p><div class="figure"><p><a name="testfig1"/><b>Figure 1.1. Test Figure</b></p><pre class="programlisting">This is a
+</p></div><div id="id2768987" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2768987"/>Dedication</h2></div></div><p>Just a test dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2769003">Foreword</a></dt><dt> <a href="#id2769030"/></dt><dt>I <a href="#id2769149">Part One Title</a></dt><dd><dl><dt>1 <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2767268">First Sect1</a></dt><dt> <a href="#id2767328">Second Sect1</a></dt><dt> <a href="#id2767349">Third Sect1</a></dt></dl></dd></dl></dd><dt>2 <a href="#id2767411">First Chapter</a></dt><dt>3 <a href="#id2767490">Second Chapter</a></dt><dt>4 <a href="#id2767710">Third Chapter</a></dt><dt>A <a href="#id2767731">First Appendix</a></dt><dt>B <a href="#id2767370">Second Appendix</a></dt></dl></div><div id="id2769003" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2769003"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div id="id2769030" class="preface"><div class="titlepage"/><p>This is a test preface.</p></div><div class="part" id="id2769149"><div class="titlepage"><div><h1 class="title"><a name="id2769149"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2765614"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2812606" href="#ftn.id2812606">1</a>]</sup>.</p><div class="sect1"><a name="id2812623"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2812623"/>PartIntro Section</h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2767268">First Sect1</a></dt><dt> <a href="#id2767328">Second Sect1</a></dt><dt> <a href="#id2767349">Third Sect1</a></dt></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2812606" href="#id2812606">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. Section <a name="stestfoo"/>Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2767268">First Sect1</a></dt><dt> <a href="#id2767328">Second Sect1</a></dt><dt> <a href="#id2767349">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2767268"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767268"/>First Sect1</h2></div></div><p>Paragraph.</p><div class="figure"><p><a name="testfig1"/><b>Figure 1.1. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div></div><div class="sect1"><a name="id2758005"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2758005"/><span class="title">Second Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2758026"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2758026"/><span class="title">Third Sect1</span></h2></div></div><p>Paragraph.</p><div class="figure"><p><a name="testfig2"/><b>Figure 1.2. Test Figure</b></p><pre class="programlisting">This is a
+</pre></div></div><div class="sect1"><a name="id2767328"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767328"/>Second Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2767349"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767349"/>Third Sect1</h2></div></div><p>Paragraph.</p><div class="figure"><p><a name="testfig2"/><b>Figure 1.2. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div></div></div></div><div id="id2758090" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2758090"/>Chapter 2. First Chapter</h2></div><div><h2 class="subtitle">Chapter Subtitle</h2></div></div><p>This is a test paragraph.</p><div class="figure"><p><a name="testfig3"/><b>Figure 2.2. Test Figure</b></p><pre class="programlisting">This is a
+</pre></div></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2767411"/>Chapter 2. First Chapter</h2></div><div><h3 class="subtitle"><i>Chapter Subtitle</i></h3></div></div><p>This is a test paragraph.</p><div class="figure"><p><a name="testfig3"/><b>Figure 2.2. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div></div><div id="id2758168" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2758168"/>Chapter 3. Second Chapter</h2></div></div><p>This is a test paragraph.
-<a class="indexterm" name="id2758186"/>
-<a class="indexterm" name="id2758202"/>
+</pre></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2767490"/>Chapter 3. Second Chapter</h2></div></div><p>This is a test paragraph.
+<a class="indexterm" name="id2767508"/>
+<a class="indexterm" name="id2767523"/>
-<a class="indexterm" name="id2758217"/>
-<a class="indexterm" name="id2758241"/>
+<a class="indexterm" name="id2767539"/>
+<a class="indexterm" name="id2767563"/>
-<a class="indexterm" name="id2758257"/>
+<a class="indexterm" name="id2767578"/>
-<a class="indexterm" name="id2758288"/>
-<a class="indexterm" name="id2758304"/>
+<a class="indexterm" name="id2767610"/>
+<a class="indexterm" name="id2767625"/>
-<a class="indexterm" name="id2758324"/>
-<a class="indexterm" name="id2758348"/>
-<a class="indexterm" name="id2758371"/></p></div><div id="id2758388" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2758388"/>Chapter 4. Third Chapter</h2></div></div><p>This is a test paragraph.</p></div><div id="id2758409" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2758409"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p><div class="figure"><p><a name="testfig4"/><b>Figure A.0. Test Figure</b></p><pre class="programlisting">This is a
+<a class="indexterm" name="id2767646"/>
+<a class="indexterm" name="id2767670"/>
+<a class="indexterm" name="id2767693"/></p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2767710"/>Chapter 4. Third Chapter</h2></div></div><p>This is a test paragraph.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2767731"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p><div class="figure"><p><a name="testfig4"/><b>Figure A.0. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div></div><div id="id2758044" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2758044"/>Appendix B. Second Appendix</h2></div></div><p>This is just a test.
-<a class="indexterm" name="id2754053"/>
-<a class="indexterm" name="id2756551"/>
+</pre></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2767370"/>Appendix B. Second Appendix</h2></div></div><p>This is just a test.
+<a class="indexterm" name="id2770740"/>
+<a class="indexterm" name="id2770755"/>
-<a class="indexterm" name="id2756567"/>
-<a class="indexterm" name="id2756590"/>
+<a class="indexterm" name="id2812488"/>
+<a class="indexterm" name="id2812511"/>
-<a class="indexterm" name="id2756606"/>
-<a class="indexterm" name="id2752579"/>
+<a class="indexterm" name="id2812527"/>
+<a class="indexterm" name="id2765852"/>
-<a class="indexterm" name="id2752594"/>
-<a class="indexterm" name="id2752618"/>
-<a class="indexterm" name="id2752641"/></p></div></div></body></html>
+<a class="indexterm" name="id2765866"/>
+<a class="indexterm" name="id2765890"/>
+<a class="indexterm" name="id2765913"/></p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/book2.xhtml b/tests/docbook/result/xhtml/book2.xhtml
index 1ad1a76a..66f2e74e 100644
--- a/tests/docbook/result/xhtml/book2.xhtml
+++ b/tests/docbook/result/xhtml/book2.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
+<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
@@ -7,30 +7,30 @@
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
- </p></div></div><hr/></div><div id="id2799237" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2799237"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
-of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2862756">Preface Title</a></dt><dt>I. <a href="#id2799323">Part One Title</a></dt><dt>II. <a href="#part">Part Two Title</a></dt><dt>III. <a href="#id2877146">A Reference Part</a></dt><dt>A. <a href="#appendix">A Very Short Appendix</a></dt><dt>B. <a href="#id2877488">A Very Long Appendix</a></dt><dd><dl><dt> <a href="#id2878138">a sect1 title</a></dt><dd><dl><dt> <a href="#id2878169">a sect2 title</a></dt></dl></dd><dt> <a href="#id2878309">another sect1 title</a></dt><dd><dl><dt> <a href="#id2878363">another sect2 title</a></dt></dl></dd><dt> <a href="#id2878598">another sect1 title</a></dt><dt> <a href="#id2878630">another sect1 title</a></dt></dl></dd><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2880682">An Index with a Title</a></dt></dl></div><div id="id2862756" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2862756"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div class="part" id="id2799323"><div class="titlepage"><div><h1 class="title"><a name="id2799323"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2799368"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2799250" href="#ftn.id2799250">1</a>]</sup>.</p><div class="sect1"><a name="id2799268"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2799268"/><span class="title">PartIntro Section</span></h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#chapter">XRef Tests</a></dt><dt>2. <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2752909">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2753426">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3. <a href="#id2753653">Inline Tests</a></dt><dt>4. <a href="#id2864145">Block Tests</a></dt><dt>5. <a href="#id2865722">List Tests</a></dt><dt>6. <a href="#id2869300">Table Tests</a></dt><dt>7. <a href="#id2874961">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2875032">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2875334">Index Term Sect 2</a></dt><dt> <a href="#id2875478">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2799250" href="#id2799250">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><h3>Xrefs</h3><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book"><i>Book Title</i></a></td></tr><tr><td><a href="#part">Part II.</a></td></tr><tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr><tr><td><a href="#appendix">Appendix A.</a></td></tr><tr><td><a href="#table">Table 4.0.</a></td></tr><tr><td><a href="#figure">Figure 4.0.</a></td></tr><tr><td><a href="#example">Example 4.0.</a></td></tr><tr><td><a href="#equation">Equation 4.0.</a></td></tr><tr><td><a href="#reference">Reference I.</a></td></tr><tr><td><a href="#bib1">&#x201C;A Test Bibliography&#x201D;</a></td></tr><tr><td><a href="#gloss">&#x201C;Example Glossary&#x201D;</a></td></tr><tr><td><a href="#index">&#x201C;Index&#x201D;</a></td></tr></table><p>This is the first reference to <i>XML</i>.
-This is the second reference to XML.
-These are references without linkend
-attributes: <i>XML</i>, XML.</p><h3>Links</h3><p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
-is available.</p><p>There is <a href="#part">a second part</a> in this book.</p><p>This is the <a href="#chapter"/>
-chapter.</p></div><div id="stchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="stchap"/>Chapter 2. Section Tests</h2></div><div><h2 class="subtitle">Section Tests Subtitle</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2752909">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2753426">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></div><p>some text. some text. some text. some text. some text. some text.
+ </p></div></div><hr/></div><div id="id2774710" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2774710"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
+of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2876038">Preface Title</a></dt><dt>I <a href="#id2812580">Part One Title</a></dt><dd><dl><dt>1 <a href="#chapter">XRef Tests</a></dt><dt>2 <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766182">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766707">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3 <a href="#id2766539">Inline Tests</a></dt><dt>4 <a href="#id2877413">Block Tests</a></dt><dt>5 <a href="#id2878989">List Tests</a></dt><dt>6 <a href="#id2882567">Table Tests</a></dt><dt>7 <a href="#id2888229">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2888300">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2888602">Index Term Sect 2</a></dt><dt> <a href="#id2888745">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></dd><dt>II <a href="#part">Part Two Title</a></dt><dd><dl><dt>8 <a href="#id2888797">CmdSynopsis Tests</a></dt><dt>9 <a href="#id2889554">FuncSynopsis Tests</a></dt><dt>10 <a href="#id2889850">Callout Tests</a></dt></dl></dd><dt>III <a href="#id2890414">A Reference Part</a></dt><dd><dl><dt>I <a href="#reference">Reference</a></dt><dd><dl><dt><a href="#id2890451">RefEntryTitle</a></dt><dt><a href="#id2890636"><tt>Chop</tt></a></dt></dl></dd></dl></dd><dt>A <a href="#appendix">A Very Short Appendix</a></dt><dt>B <a href="#id2890756">A Very Long Appendix</a></dt><dd><dl><dt> <a href="#id2891406">a sect1 title</a></dt><dd><dl><dt> <a href="#id2891437">a sect2 title</a></dt></dl></dd><dt> <a href="#id2891576">another sect1 title</a></dt><dd><dl><dt> <a href="#id2891631">another sect2 title</a></dt></dl></dd><dt> <a href="#id2891866">another sect1 title</a></dt><dt> <a href="#id2891898">another sect1 title</a></dt></dl></dd><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2893950">An Index with a Title</a></dt></dl></div><div id="id2876038" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2876038"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div class="part" id="id2812580"><div class="titlepage"><div><h1 class="title"><a name="id2812580"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2812625"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2812499" href="#ftn.id2812499">1</a>]</sup>.</p><div class="sect1"><a name="id2812517"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2812517"/>PartIntro Section</h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#chapter">XRef Tests</a></dt><dt>2 <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766182">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766707">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3 <a href="#id2766539">Inline Tests</a></dt><dt>4 <a href="#id2877413">Block Tests</a></dt><dt>5 <a href="#id2878989">List Tests</a></dt><dt>6 <a href="#id2882567">Table Tests</a></dt><dt>7 <a href="#id2888229">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2888300">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2888602">Index Term Sect 2</a></dt><dt> <a href="#id2888745">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2812499" href="#id2812499">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><h4>Xrefs</h4><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book" title="Book Title">Book Title</a></td></tr><tr><td><a href="#part" title="Part II. Part Two Title">Part II. Part Two Title</a></td></tr><tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr><tr><td><a href="#appendix" title="Appendix A. A Very Short Appendix">Appendix A. A Very Short Appendix</a></td></tr><tr><td><a href="#table" title="Table 4.0. A Table">Table 4.0. A Table</a></td></tr><tr><td><a href="#figure" title="Figure 4.0. A Figure">Figure 4.0. A Figure</a></td></tr><tr><td><a href="#example" title="Example 4.0. An Example">Example 4.0. An Example</a></td></tr><tr><td><a href="#equation" title="Equation 4.0. An Equation"></a></td></tr><tr><td><a href="#reference" title="Reference">Reference</a></td></tr><tr><td><a href="#bib1" title="A Test Bibliography">A Test Bibliography</a></td></tr><tr><td><a href="#gloss" title="Example Glossary">Example Glossary</a></td></tr><tr><td><a href="#index" title="Index">Index</a></td></tr></table><p>This is the first reference to <i>XML</i>.
+This is the second reference to <a href="#xml"><i>XML</i></a>.
+These are references without <tt>linkend</tt>
+attributes: <i>XML</i>, <i>XML</i>.</p><h4>Links</h4><p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
+is available.</p><p>There is <a href="#part" title="Part II. Part Two Title">a second part</a> in this book.</p><p>This is the <a href="#chapter" title="Chapter 1. XRef Tests"/>
+chapter.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="stchap"/>Chapter 2. Section Tests</h2></div><div><h3 class="subtitle"><i>Section Tests Subtitle</i></h3></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766182">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766707">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2758046"/>
-<a class="indexterm" name="id2758062"/>
+<a class="indexterm" name="id2767367"/>
+<a class="indexterm" name="id2767382"/>
-<a class="indexterm" name="id2758077"/>
-<a class="indexterm" name="id2758101"/>
+<a class="indexterm" name="id2767398"/>
+<a class="indexterm" name="id2767422"/>
-<a class="indexterm" name="id2758117"/>
-<a class="indexterm" name="id2758148"/>
+<a class="indexterm" name="id2767437"/>
+<a class="indexterm" name="id2767469"/>
-<a class="indexterm" name="id2758164"/>
-<a class="indexterm" name="id2758187"/>
-<a class="indexterm" name="id2758211"/></p><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2767484"/>
+<a class="indexterm" name="id2767508"/>
+<a class="indexterm" name="id2767531"/></p><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -45,26 +45,26 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect1"><a name="secttest1"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest1"/><span class="title">a sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect1"><a name="secttest1"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest1"/>a sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2758318"/>
-<a class="indexterm" name="id2758350"/>
-<a class="indexterm" name="id2758373"/>
+<a class="indexterm" name="id2767639"/>
+<a class="indexterm" name="id2767670"/>
+<a class="indexterm" name="id2767694"/>
-<a class="indexterm" name="id2758389"/>
-<a class="indexterm" name="id2758412"/>
-<a class="indexterm" name="id2757804"/>
+<a class="indexterm" name="id2767710"/>
+<a class="indexterm" name="id2767733"/>
+<a class="indexterm" name="id2767597"/>
-<a class="indexterm" name="id2757890"/>
-<a class="indexterm" name="id2752735"/>
-<a class="indexterm" name="id2752759"/>
-<a class="indexterm" name="id2752790"/>
-<a class="indexterm" name="id2752821"/>
-<a class="indexterm" name="id2752845"/></p><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2767208"/>
+<a class="indexterm" name="id2766008"/>
+<a class="indexterm" name="id2766032"/>
+<a class="indexterm" name="id2766063"/>
+<a class="indexterm" name="id2766094"/>
+<a class="indexterm" name="id2766118"/></p><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -79,81 +79,81 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2752909"/><div class="titlepage"><div><h3 class="title"><a name="id2752909"/><span class="title">a sect2 title</span></h3></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2766182"/><div class="titlepage"><div><h3 class="title"><a name="id2766182"/>a sect2 title</h3></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2752940"/><div class="titlepage"><div><h4 class="title"><a name="id2752940"/><span class="title">a sect3 title</span></h4></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2766213"/><div class="titlepage"><div><h4 class="title"><a name="id2766213"/>a sect3 title</h4></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752969"/>
-<a class="indexterm" name="id2753000"/>
-<a class="indexterm" name="id2753031"/>
+<a class="indexterm" name="id2766242"/>
+<a class="indexterm" name="id2766273"/>
+<a class="indexterm" name="id2766304"/>
-<a class="indexterm" name="id2753047"/>
-<a class="indexterm" name="id2753063"/>
-<a class="indexterm" name="id2753086"/>
-<a class="indexterm" name="id2753118"/>
-<a class="indexterm" name="id2753149"/>
-<a class="indexterm" name="id2753180"/></p><div class="sect4"><a name="id2753195"/><div class="titlepage"><div><h5 class="title"><a name="id2753195"/><span class="title">a sect4 title</span></h5></div></div><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2766320"/>
+<a class="indexterm" name="id2766336"/>
+<a class="indexterm" name="id2766359"/>
+<a class="indexterm" name="id2766391"/>
+<a class="indexterm" name="id2766422"/>
+<a class="indexterm" name="id2766453"/></p><div class="sect4"><a name="id2766468"/><div class="titlepage"><div><h5 class="title"><a name="id2766468"/>a sect4 title</h5></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2753226"/><div class="titlepage"><div><h6 class="title"><a name="id2753226"/><span class="title">a sect5 title</span></h6></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2766499"/><div class="titlepage"><div><h6 class="title"><a name="id2766499"/>a sect5 title</h6></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest2"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest2"/><span class="title">another sect1 title</span></h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest2"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766558"/>another sect1 title</h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753264"/>
-<a class="indexterm" name="id2753349"/>
-<a class="indexterm" name="id2753380"/>
-<a class="indexterm" name="id2753412"/></p><div class="sect2"><a name="id2753426"/><div class="titlepage"><div><h3 class="title"><a name="id2753426"/><span class="title">another sect2 title</span></h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2766614"/>
+<a class="indexterm" name="id2766630"/>
+<a class="indexterm" name="id2766661"/>
+<a class="indexterm" name="id2766692"/></p><div class="sect2"><a name="id2766707"/><div class="titlepage"><div><h3 class="title"><a name="id2766713"/>another sect2 title</h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2753481"/><div class="titlepage"><div><h4 class="title"><a name="id2753481"/><span class="title">another sect3 title</span></h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2766762"/><div class="titlepage"><div><h4 class="title"><a name="id2766768"/>another sect3 title</h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2753535"/><div class="titlepage"><div><h5 class="title"><a name="id2753535"/><span class="title">another sect4 title</span></h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2766816"/><div class="titlepage"><div><h5 class="title"><a name="id2766822"/>another sect4 title</h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2753590"/><div class="titlepage"><div><h6 class="title"><a name="id2753590"/><span class="title">another sect5 title</span></h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2766870"/><div class="titlepage"><div><h6 class="title"><a name="id2766877"/>another sect5 title</h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest3"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest3"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest3"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest3"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="secttest4"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest4"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="secttest4"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest4"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div><div id="id2753653" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2753653"/>Chapter 3. Inline Tests</h2></div></div><div class="simplesect"><a name="id2863076"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2863076"/><span class="title">Testing `Quotes' in a title</span></h2></div></div><p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
-Sort of<sup>[<a name="id2863129" href="#ftn.id2863129">3</a>]</sup>.
-Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Abbrev</td><td>GUIIcon</td><td>SGMLTag (Attribute)</td></tr><tr><td>Acronym</td><td>GUILabel</td><td><tt>SGMLTag</tt> (AttValue)</td></tr><tr><td>Action</td><td>GUIMenu</td><td><tt>SGMLTag</tt> (Element)</td></tr><tr><td>Application</td><td>GUISubMenu</td><td><tt>&lt;/SGMLTag&gt;</tt> (EndTag)</td></tr><tr><td>[Citation]</td><td>Hardware</td><td><tt>&amp;SGMLTag;</tt> (GenEntity)</td></tr><tr><td>CiteRefEntry RefEntryTitle(n)</td><td><p><img src="emc2.gif"/></p></td><td><tt>&amp;#SGMLTag;</tt> (NumCharRef)</td></tr><tr><td><i>Citetitle</i></td><td>Interface</td><td><tt>%SGMLTag;</tt> (ParamEntity)</td></tr><tr><td><tt>ClassName</tt></td><td>InterfaceDefinition</td><td><tt>&lt;?SGMLTag&gt;</tt> (PI)</td></tr><tr><td><b>Command</b></td><td><b>KeyCap</b></td><td><tt>&lt;!--SGMLTag--&gt;</tt> (SGMLComment)</td></tr><tr><td><i>Comment</i> (Comment)</td><td>KeyCode</td><td><tt>&lt;SGMLTag&gt;</tt> (StartTag)</td></tr><tr><td><tt>ComputerOutput</tt></td><td>Key-Combo</td><td><tt>SGMLTag</tt></td></tr><tr><td>Database</td><td>KeySym</td><td><i><tt>StructField</tt></i></td></tr><tr><td>ErrorName</td><td><tt>Literal</tt></td><td>StructName</td></tr><tr><td>ErrorType</td><td>Markup</td><td><sub>Subscript</sub></td></tr><tr><td><tt>&lt;<a href="mailto:Email">Email</a>&gt;</tt></td><td><i>MediaLabel</i></td><td><sup>Superscript</sup></td></tr><tr><td><i>Emphasis</i></td><td>MouseButton</td><td>Symbol</td></tr><tr><td><tt>EnVar</tt></td><td><tt>Option</tt></td><td><tt>SystemItem</tt></td></tr><tr><td>ErrorCode</td><td>[Optional]</td><td>Token</td></tr><tr><td><tt>Filename</tt></td><td><i><tt>Parameter</tt></i></td><td>Trademark</td></tr><tr><td><i>Firstterm</i></td><td>Phrase</td><td>Type</td></tr><tr><td><i>ForeignPhrase</i></td><td><tt>Prompt</tt></td><td><b><tt>UserInput</tt></b></td></tr><tr><td><tt>Function</tt></td><td>Property</td><td><i>WordAsWord</i></td></tr><tr><td>GUIMenuItem</td><td>&#x201C;Quote&#x201D;</td><td>ProductName</td></tr><tr><td>GUIButton</td><td><i><tt>Replaceable</tt></i></td><td>&nbsp;</td></tr><tr><td>GUIButton (with Accel)</td><td>ReturnValue</td><td>&nbsp;</td></tr></table><p>And here are a couple of index terms, as another test (of
+some text. some text. some text. some text. some text. some text. some text. </p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2766539"/>Chapter 3. Inline Tests</h2></div></div><div class="simplesect"><a name="id2876347"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2876347"/>Testing &#x2018;Quotes&#x2019; in a title</h2></div></div><p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
+Sort of<sup>[<a name="id2876397" href="#ftn.id2876397">3</a>]</sup>.
+Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Abbrev</td><td>GUIIcon</td><td><tt>SGMLTag</tt> (Attribute)</td></tr><tr><td>Acronym</td><td>GUILabel</td><td><tt>SGMLTag</tt> (AttValue)</td></tr><tr><td>Action</td><td>GUIMenu</td><td><tt>SGMLTag</tt> (Element)</td></tr><tr><td>Application</td><td>GUISubMenu</td><td><tt>&lt;/SGMLTag&gt;</tt> (EndTag)</td></tr><tr><td>[Citation]</td><td>Hardware</td><td><tt>&amp;SGMLTag;</tt> (GenEntity)</td></tr><tr><td>CiteRefEntry RefEntryTitle(n)</td><td><p><img src="emc2.gif"/></p></td><td><tt>&amp;#SGMLTag;</tt> (NumCharRef)</td></tr><tr><td><i>Citetitle</i></td><td>Interface</td><td><tt>%SGMLTag;</tt> (ParamEntity)</td></tr><tr><td><tt>ClassName</tt></td><td>InterfaceDefinition</td><td><tt>&lt;?SGMLTag&gt;</tt> (PI)</td></tr><tr><td><b>Command</b></td><td><b>KeyCap</b></td><td><tt>&lt;!--SGMLTag--&gt;</tt> (SGMLComment)</td></tr><tr><td><i>Comment</i> (Comment)</td><td>KeyCode</td><td><tt>&lt;SGMLTag&gt;</tt> (StartTag)</td></tr><tr><td><tt>ComputerOutput</tt></td><td>Key-Combo</td><td><tt>SGMLTag</tt></td></tr><tr><td>Database</td><td>KeySym</td><td><i><tt>StructField</tt></i></td></tr><tr><td>ErrorName</td><td><tt>Literal</tt></td><td>StructName</td></tr><tr><td>ErrorType</td><td>Markup</td><td><sub>Subscript</sub></td></tr><tr><td><tt>&lt;<a href="mailto:Email">Email</a>&gt;</tt></td><td><i>MediaLabel</i></td><td><sup>Superscript</sup></td></tr><tr><td><i>Emphasis</i></td><td>MouseButton</td><td>Symbol</td></tr><tr><td><tt>EnVar</tt></td><td><tt>Option</tt></td><td><tt>SystemItem</tt></td></tr><tr><td>ErrorCode</td><td>[Optional]</td><td>Token</td></tr><tr><td><tt>Filename</tt></td><td><i><tt>Parameter</tt></i></td><td>Trademark&#x2122;</td></tr><tr><td><i>Firstterm</i></td><td>Phrase</td><td>Type</td></tr><tr><td><i>ForeignPhrase</i></td><td><tt>Prompt</tt></td><td><b><tt>UserInput</tt></b></td></tr><tr><td><tt>Function</tt></td><td>Property</td><td><i>WordAsWord</i></td></tr><tr><td>GUIMenuItem</td><td>&#x201C;Quote&#x201D;</td><td>ProductName</td></tr><tr><td>GUIButton</td><td><i><tt>Replaceable</tt></i></td><td>&nbsp;</td></tr><tr><td>GUIButton (with Accel)</td><td>ReturnValue</td><td>&nbsp;</td></tr></table><p>And here are a couple of index terms, as another test (of
index terms, not inlines).
-<a class="indexterm" name="id2864096"/>
-<a class="indexterm" name="id2864119"/></p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div><div class="footnote"><p><sup>[<a name="ftn.id2863129" href="#id2863129">3</a>] </sup>Well, the marks are, anyway!</p></div></div></div><div id="id2864145" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2864145"/>Chapter 4. Block Tests</h2></div></div><div class="simplesect"><a name="id2864159"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2864159"/><span class="title">Formal Objects</span></h2></div></div><h3>Example</h3><div class="example"><p><a name="example"/><b>Example 4.0. An Example</b></p><p>This is an example of a trivial example.</p></div><h3>Figure</h3><div class="figure"><p><a name="figure"/><b>Figure 4.0. A Figure</b></p><pre class="screen">This is an example of a trivial figure.</pre></div><h3>Equation</h3><div class="equation"><p><a name="equation"/><b>Equation 4.0. An Equation</b></p><p><img src="emc2.gif"/></p></div><h3>Table</h3><div class="table"><p><a name="table"/><b>Table 4.0. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2864469"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2864469"/><span class="title">Informal Objects</span></h2></div></div><h3>InformalExample</h3><div class="informalexample" id="iexample"><p/><a name="iexample"/><p>This is an example of a trivial, informal example.</p><p/></div><h3>InformalEquation</h3><div class="informalequation" id="iequation"><p/><a name="iequation"/><p><img src="emc2.gif"/></p><p/></div><h3>InformalTable</h3><div class="informaltable" id="itable"><p/><a name="itable"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>8</td></tr><tr><td>3</td><td>27</td></tr></tbody></table><p/></div></div><div class="simplesect"><a name="id2864693"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2864693"/><span class="title">Admonitions</span></h2></div></div><h3>Note</h3><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864721">Note</a></h3><p>Consider yourself noted.</p><p>Second para.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864744">Note</a></h3><p>Consider yourself noted, simply.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864760">NoteTitle</a></h3><p>Consider yourself noted.</p><p>Second para, with a title.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864792">Att</a></h3><p>Consider yourself noted, simply.</p><p>With a title</p></div><h3>Important</h3><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864839">Important</a></h3><p>Consider yourself important.</p></div><h3>Tip</h3><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864857">Tip</a></h3><p>Consider yourself tipped.</p></div><h3>Warning</h3><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864898">Warning</a></h3><p>Consider yourself warned.</p></div><h3>Caution</h3><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864927">Caution</a></h3><p>Consider yourself cautioned.</p></div><h3>SimPara in Caution</h3><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864957">Simple Caution</a></h3><p>A simpler caution.</p></div></div><div class="simplesect"><a name="id2864982"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2864982"/><span class="title">Other Objects</span></h2></div></div><h3>Screen</h3><pre class="screen">This
+<a class="indexterm" name="id2877364"/>
+<a class="indexterm" name="id2877387"/></p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div><div class="footnote"><p><sup>[<a name="ftn.id2876397" href="#id2876397">3</a>] </sup>Well, the marks are, anyway!</p></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2877413"/>Chapter 4. Block Tests</h2></div></div><div class="simplesect"><a name="id2877427"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2877427"/>Formal Objects</h2></div></div><h5>Example</h5><div class="example"><p><a name="example"/><b>Example 4.0. An Example</b></p><p>This is an example of a trivial example.</p></div><h5>Figure</h5><div class="figure"><p><a name="figure"/><b>Figure 4.0. A Figure</b></p><pre class="screen">This is an example of a trivial figure.</pre></div><h5>Equation</h5><div class="equation"><p><a name="equation"/><b>Equation 4.0. An Equation</b></p><p><img src="emc2.gif"/></p></div><h5>Table</h5><div class="table"><p><a name="table"/><b>Table 4.0. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2877737"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2877737"/>Informal Objects</h2></div></div><h5>InformalExample</h5><div class="informalexample" id="iexample"><a name="iexample"/><p>This is an example of a trivial, informal example.</p></div><h5>InformalEquation</h5><div class="informalequation" id="iequation"><a name="iequation"/><p><img src="emc2.gif"/></p></div><h5>InformalTable</h5><div class="informaltable" id="itable"><a name="itable"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>8</td></tr><tr><td>3</td><td>27</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2877961"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2877961"/>Admonitions</h2></div></div><h5>Note</h5><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877989"/>Note</h3><p>Consider yourself noted.</p><p>Second para.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878012"/>Note</h3><p>Consider yourself noted, simply.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878028"/>NoteTitle</h3><p>Consider yourself noted.</p><p>Second para, with a title.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878060"/>Att</h3><p>Consider yourself noted, simply.</p><p>With a title</p></div><h5>Important</h5><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878107"/>Important</h3><p>Consider yourself important.</p></div><h5>Tip</h5><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878125"/>Tip</h3><p>Consider yourself tipped.</p></div><h5>Warning</h5><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878166"/>Warning</h3><p>Consider yourself warned.</p></div><h5>Caution</h5><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878195"/>Caution</h3><p>Consider yourself cautioned.</p></div><h5>SimPara in Caution</h5><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878225"/>Simple Caution</h3><p>A simpler caution.</p></div></div><div class="simplesect"><a name="id2878250"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2878250"/>Other Objects</h2></div></div><h5>Screen</h5><pre class="screen">This
is With a line-annotation
a
screen
@@ -164,10 +164,10 @@ screen
This
is With a line-annotation
a
- screen</pre><h3>ProgramListing</h3><pre class="programlisting">This
+ screen</pre><h5>ProgramListing</h5><pre class="programlisting">This
is
a
-programlisting</pre><h3>Address</h3><div class="address">Norman Walsh<br/>
+programlisting</pre><h5>Address</h5><div class="address">Norman Walsh<br/>
ArborText, Inc.<br/>
1000 Victors Way<br/>
Ann Arbor, MI 48108<br/>
@@ -177,68 +177,68 @@ Voice: 313.997.0200<br/>
Fax: 313.997.0201<br/>
<br/>
Email: <tt>&lt;<a href="mailto:nwalsh@arbortext.com">nwalsh@arbortext.com</a>&gt;</tt><br/>
-WWW: http://www.arbortext.com/</div><h3>BlockQuote</h3><blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
+WWW: http://www.arbortext.com/</div><h5>BlockQuote</h5><blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
-no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote><h3>Procedure</h3><div class="procedure"><ol><li><p>This is the first step</p></li><li><p>This is the second step</p><ol><li><p>This is the first substep</p></li><li><p>This is the second substep</p></li></ol></li><li><p>This is the third step</p></li></ol></div><h3>Procedure With Title</h3><div class="procedure"><p><b>Same Procedure with a Title</b></p><ol><li><p>This is the first step</p></li><li><p>This is the second step</p><ol><li><p>This is the first substep</p></li><li><p>This is the second substep</p></li></ol></li><li><p>This is the third step</p></li></ol></div><h3>SideBar</h3><div class="sidebar"><a name="id2865441"/><p class="title"><b>What About Bob?</b></p><p>This is a sidebar.</p></div><h3>MsgSet</h3><p>It's not really clear how <tt>MsgSet</tt> should be presented.
-I expect that it's fairly application, if not document, specific.</p><div class="msgentry"><a name="id2865502"/><div class="msg"><a name="id2865508"/><p>Record failed CRC</p><p>Record <i><tt>n</tt></i>
+no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote><h5>Procedure</h5><div class="procedure"><a name="id2878488"/><ol><li><a name="id2878494"/><p>This is the first step</p></li><li><a name="id2878510"/><p>This is the second step</p><ol type="a"><li><a name="id2878530"/><p>This is the first substep</p></li><li><a name="id2878546"/><p>This is the second substep</p></li></ol></li><li><a name="id2878469"/><p>This is the third step</p></li></ol></div><h5>Procedure With Title</h5><div class="procedure"><a name="id2878592"/><p><b>Same Procedure with a Title</b></p><ol><li><a name="id2878605"/><p>This is the first step</p></li><li><a name="id2878621"/><p>This is the second step</p><ol type="a"><li><a name="id2878642"/><p>This is the first substep</p></li><li><a name="id2878658"/><p>This is the second substep</p></li></ol></li><li><a name="id2878677"/><p>This is the third step</p></li></ol></div><h5>SideBar</h5><div class="sidebar"><a name="id2878709"/><p class="title"><b>What About Bob?</b></p><p>This is a sidebar.</p></div><h5>MsgSet</h5><p>It's not really clear how <tt>MsgSet</tt> should be presented.
+I expect that it's fairly application, if not document, specific.</p><div class="msgentry"><a name="id2878770"/><div class="msg"><a name="id2878776"/><p>Record failed CRC</p><p>Record <i><tt>n</tt></i>
in <i><tt>database</tt></i></p><p>File read error on
- <i><tt>database</tt></i></p><p>Panic! Corrupt record!</p></div><div class="msginfo"><a name="id2865631"/><p><b>Level: </b>severe</p><p><b>Origin: </b>server</p><p><b>Audience: </b>all</p></div><div class="msgexplan"><a name="id2865662"/><p> Indicates that some sort of error occured attempting to load
+ <i><tt>database</tt></i></p><p>Panic! Corrupt record!</p></div><div class="msginfo"><a name="id2878898"/><p><b>Level: </b>severe</p><p><b>Origin: </b>server</p><p><b>Audience: </b>all</p></div><div class="msgexplan"><a name="id2878930"/><p> Indicates that some sort of error occured attempting to load
a record from the database. Retry. If failure persists,
contact the database administrator.
- </p></div></div><h3>LiteralLayout</h3><div class="literallayout">This is a<br/>
+ </p></div></div><h5>LiteralLayout</h5><div class="literallayout">This is a<br/>
literal<br/>
       layout</div><p><div class="literallayout">This is a<br/>
literal<br/>
       layout<br/>
-  in a para</div></p></div></div><div id="id2865722" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2865722"/>Chapter 5. List Tests</h2></div></div><div class="simplesect"><a name="id2865736"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2865736"/><span class="title">OrderedLists</span></h2></div></div><h3>Default Numeration</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2865770"/>One</p></li><li><a name="id2865785"/><pre class="programlisting">this one starts with
+  in a para</div></p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2878989"/>Chapter 5. List Tests</h2></div></div><div class="simplesect"><a name="id2879003"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2879003"/>OrderedLists</h2></div></div><h5>Default Numeration</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2879037"/>One</p></li><li><a name="id2879053"/><pre class="programlisting">this one starts with
a program listing
-what happens?</pre></li><li><a name="id2865802"/><pre class="synopsis">this one starts with
+what happens?</pre></li><li><a name="id2879070"/><pre class="synopsis">this one starts with
a synopsis
-what happens?</pre></li><li><p><a name="id2865819"/>para first</p><pre class="synopsis">this one has
+what happens?</pre></li><li><p><a name="id2879086"/>para first</p><pre class="synopsis">this one has
a synopsis
-what happens?</pre></li><li><p><a name="id2865843"/>Three</p><pre class="screen">A
+what happens?</pre></li><li><p><a name="id2879111"/>Three</p><pre class="screen">A
Screen
-Here</pre></li><li><p><a name="id2865867"/>Four</p></li></ol></div><h3>Arabic Numeration</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2865900"/>One</p></li><li><p><a name="id2865925"/>Two</p></li><li><p><a name="id2865940"/>Three</p></li><li><p><a name="id2865956"/>Four</p></li></ol></div><h3>Arabic Numeration (Long)</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2865989"/>One</p></li><li><p><a name="id2866015"/>Two</p></li><li><p><a name="id2866030"/>Three</p></li><li><p><a name="id2866046"/>Four</p></li><li><p><a name="id2866062"/>Five</p></li><li><p><a name="id2866077"/>Six</p></li><li><p><a name="id2866093"/>Seven</p></li><li><p><a name="id2866109"/>Eight</p></li><li><p><a name="id2866124"/>Nine</p></li><li><p><a name="id2866140"/>Ten</p></li><li><p><a name="id2866156"/>Eleven</p></li></ol></div><h3>UpperAlpha Numeration</h3><div class="orderedlist"><ol type="A"><li><p><a name="id2866189"/>One</p></li><li><p><a name="id2866215"/>Two</p></li><li><p><a name="id2866230"/>Three</p></li><li><p><a name="id2866246"/>Four</p></li></ol></div><h3>LowerAlpha Numeration</h3><div class="orderedlist"><ol type="a"><li><p><a name="id2866279"/>One</p></li><li><p><a name="id2866305"/>Two</p></li><li><p><a name="id2866320"/>Three</p></li><li><p><a name="id2866336"/>Four</p></li></ol></div><h3>UpperRoman Numeration</h3><div class="orderedlist"><ol type="I"><li><p><a name="id2866369"/>One</p></li><li><p><a name="id2866395"/>Two</p></li><li><p><a name="id2866411"/>Three</p></li><li><p><a name="id2866426"/>Four</p></li></ol></div><h3>LowerRoman Numeration</h3><div class="orderedlist"><ol type="i"><li><p><a name="id2866459"/>One</p></li><li><p><a name="id2866485"/>Two</p></li><li><p><a name="id2866501"/>Three</p></li><li><p><a name="id2866516"/>Four</p></li></ol></div><h3>Continued</h3><p>First list:
-<div class="orderedlist"><ol type="1"><li><p><a name="id2866560"/>One</p></li><li><p><a name="id2866576"/>Two</p></li><li><p><a name="id2866591"/>Three</p></li><li><p><a name="id2866607"/>Four</p></li></ol></div></p><p>Second list:
-<div class="orderedlist"><ol start="5" type="1"><li><p><a name="id2866632"/>Five</p></li><li><p><a name="id2866657"/>Six</p></li><li><p><a name="id2866673"/>Seven</p></li><li><p><a name="id2866688"/>Eight</p></li><li><p><a name="id2866704"/>Nine</p></li><li><p><a name="id2866720"/>Ten</p></li></ol></div></p></div><div class="simplesect"><a name="id2866738"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2866738"/><span class="title">ItemizedLists</span></h2></div></div><h3>Default Presentation</h3><div class="itemizedlist"><ul><li><p><a name="id2866772"/>One</p></li><li><a name="id2866788"/><pre class="programlisting">One-point-five. This one starts with
+Here</pre></li><li><p><a name="id2879134"/>Four</p></li></ol></div><h5>Arabic Numeration</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2879167"/>One</p></li><li><p><a name="id2879193"/>Two</p></li><li><p><a name="id2879208"/>Three</p></li><li><p><a name="id2879224"/>Four</p></li></ol></div><h5>Arabic Numeration (Long)</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2879256"/>One</p></li><li><p><a name="id2879282"/>Two</p></li><li><p><a name="id2879298"/>Three</p></li><li><p><a name="id2879314"/>Four</p></li><li><p><a name="id2879329"/>Five</p></li><li><p><a name="id2879345"/>Six</p></li><li><p><a name="id2879361"/>Seven</p></li><li><p><a name="id2879376"/>Eight</p></li><li><p><a name="id2879392"/>Nine</p></li><li><p><a name="id2879408"/>Ten</p></li><li><p><a name="id2879424"/>Eleven</p></li></ol></div><h5>UpperAlpha Numeration</h5><div class="orderedlist"><ol type="A"><li><p><a name="id2879456"/>One</p></li><li><p><a name="id2879482"/>Two</p></li><li><p><a name="id2879498"/>Three</p></li><li><p><a name="id2879514"/>Four</p></li></ol></div><h5>LowerAlpha Numeration</h5><div class="orderedlist"><ol type="a"><li><p><a name="id2879547"/>One</p></li><li><p><a name="id2879572"/>Two</p></li><li><p><a name="id2879588"/>Three</p></li><li><p><a name="id2879604"/>Four</p></li></ol></div><h5>UpperRoman Numeration</h5><div class="orderedlist"><ol type="I"><li><p><a name="id2879637"/>One</p></li><li><p><a name="id2879663"/>Two</p></li><li><p><a name="id2879678"/>Three</p></li><li><p><a name="id2879694"/>Four</p></li></ol></div><h5>LowerRoman Numeration</h5><div class="orderedlist"><ol type="i"><li><p><a name="id2879727"/>One</p></li><li><p><a name="id2879753"/>Two</p></li><li><p><a name="id2879768"/>Three</p></li><li><p><a name="id2879784"/>Four</p></li></ol></div><h5>Continued</h5><p>First list:
+<div class="orderedlist"><ol type="1"><li><p><a name="id2879828"/>One</p></li><li><p><a name="id2879843"/>Two</p></li><li><p><a name="id2879859"/>Three</p></li><li><p><a name="id2879875"/>Four</p></li></ol></div></p><p>Second list:
+<div class="orderedlist"><ol start="5" type="1"><li><p><a name="id2879899"/>Five</p></li><li><p><a name="id2879925"/>Six</p></li><li><p><a name="id2879940"/>Seven</p></li><li><p><a name="id2879956"/>Eight</p></li><li><p><a name="id2879972"/>Nine</p></li><li><p><a name="id2879988"/>Ten</p></li></ol></div></p></div><div class="simplesect"><a name="id2880006"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2880006"/>ItemizedLists</h2></div></div><h5>Default Presentation</h5><div class="itemizedlist"><ul><li><p><a name="id2880040"/>One</p></li><li><a name="id2880056"/><pre class="programlisting">One-point-five. This one starts with
a program listing
-what happens?</pre></li><li><p><a name="id2866805"/>Two</p></li><li><p><a name="id2866821"/>Three</p></li><li><p><a name="id2866837"/>Four</p></li></ul></div><h3>Block Elements in a List</h3><div class="itemizedlist"><ul><li><p><a name="id2866874"/>One</p><p>Another para.</p></li><li><p><a name="id2866898"/>Two</p></li><li><p><a name="id2866913"/>Three</p></li><li><p><a name="id2866929"/>Four</p></li></ul></div><h3>Alternate Mark and OverRide</h3><div class="itemizedlist"><ul><li><p><a name="id2866963"/>TeX and LaTeX</p></li><li style="list-style-type: disc"><p><a name="id2866993"/>Troff</p></li><li><p><a name="id2867009"/>Lout</p></li><li style="list-style-type: none"><p><a name="id2867029"/>Test</p></li></ul></div><h3>No mark Presentation</h3><div class="itemizedlist"><ul><li style="list-style-type: none"><p><a name="id2867078"/>One</p></li><li style="list-style-type: disc"><p><a name="id2867097"/>Two</p></li><li><p><a name="id2867113"/>Three</p></li><li><p><a name="id2867129"/>Four</p></li></ul></div></div><div class="simplesect"><a name="id2867148"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2867148"/><span class="title">VariableLists</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2867169"/><span class="term">Term1</span></dt><dd><p><a name="id2867183"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+what happens?</pre></li><li><p><a name="id2880073"/>Two</p></li><li><p><a name="id2880089"/>Three</p></li><li><p><a name="id2880104"/>Four</p></li></ul></div><h5>Block Elements in a List</h5><div class="itemizedlist"><ul><li><p><a name="id2880142"/>One</p><p>Another para.</p></li><li><p><a name="id2880165"/>Two</p></li><li><p><a name="id2880181"/>Three</p></li><li><p><a name="id2880197"/>Four</p></li></ul></div><h5>Alternate Mark and OverRide</h5><div class="itemizedlist"><ul><li><p><a name="id2880231"/>TeX and LaTeX</p></li><li style="list-style-type: disc"><p><a name="id2880261"/>Troff</p></li><li><p><a name="id2880276"/>Lout</p></li><li style="list-style-type: none"><p><a name="id2880297"/>Test</p></li></ul></div><h5>No mark Presentation</h5><div class="itemizedlist"><ul><li style="list-style-type: none"><p><a name="id2880345"/>One</p></li><li style="list-style-type: disc"><p><a name="id2880365"/>Two</p></li><li><p><a name="id2880381"/>Three</p></li><li><p><a name="id2880396"/>Four</p></li></ul></div></div><div class="simplesect"><a name="id2880415"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2880415"/>VariableLists</h2></div></div><div class="variablelist"><dl><dt><a name="id2880436"/><span class="term">Term1</span></dt><dd><p><a name="id2880451"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2867206"/><span class="term">Term2</span></dt><dd><p><a name="id2867221"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2880474"/><span class="term">Term2</span></dt><dd><p><a name="id2880488"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2867244"/><span class="term">Term3</span></dt><dd><p><a name="id2867258"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2880512"/><span class="term">Term3</span></dt><dd><p><a name="id2880526"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="itemizedlist"><ul><li><p><a name="id2867285"/>One</p></li><li><p><a name="id2867300"/>Two</p></li><li><p><a name="id2867316"/>Three</p></li><li><p><a name="id2867332"/>Four</p></li></ul></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="itemizedlist"><ul><li><p><a name="id2880552"/>One</p></li><li><p><a name="id2880568"/>Two</p></li><li><p><a name="id2880584"/>Three</p></li><li><p><a name="id2880600"/>Four</p></li></ul></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2867367"/><span class="term">Term4</span></dt><dd><p><a name="id2867381"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2880634"/><span class="term">Term4</span></dt><dd><p><a name="id2880648"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div><div class="variablelist"><dl><dt><a name="id2867413"/><span class="term">Another List</span></dt><dd><p><a name="id2867427"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div><div class="variablelist"><dl><dt><a name="id2880680"/><span class="term">Another List</span></dt><dd><p><a name="id2880695"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2867450"/><span class="term">ProgramListing</span></dt><dd><pre class="programlisting">A ProgramListing
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2880718"/><span class="term">ProgramListing</span></dt><dd><pre class="programlisting">A ProgramListing
Is the First Element
of this VarListEntry</pre><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div></div><div class="simplesect"><a name="id2867501"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2867501"/><span class="title">SimpleLists</span></h2></div></div><h3>Inline</h3><p>An inline simple list:
-<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span></p><h3>Horiz</h3><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr><tr><td>Seven</td><td>&nbsp;</td><td>&nbsp;</td></tr></table><h3>Vert</h3><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Four</td><td>Seven</td></tr><tr><td>Two</td><td>Five</td><td>&nbsp;</td></tr><tr><td>Three</td><td>Six</td><td>&nbsp;</td></tr></table></div><div class="simplesect"><a name="id2867775"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2867775"/><span class="title">More Complex List Item Content</span></h2></div></div><div class="itemizedlist"><ul><li><p><a name="id2867796"/>One</p><p>Second para</p></li><li><p><a name="id2867820"/>Two</p><p>Second para</p></li><li><a name="id2867843"/><p>Three</p><p>Second para</p></li><li><p><a name="id2867867"/>Four</p><p>Second para</p></li><li><a name="id2867890"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2867930"/>Six</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2867953"/>One</p><p>Second para</p></li><li><p><a name="id2867977"/>Two</p><p>Second para</p></li><li><a name="id2868000"/><p>Three</p><p>Second para</p></li><li><p><a name="id2868024"/>Four</p><p>Second para</p></li><li><a name="id2868047"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2868087"/>Six</p></li></ol></div></div><div class="simplesect"><a name="id2868106"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2868106"/><span class="title">Segmented List</span></h2></div></div><p><b>State Birds</b></p><p><b>State: </b>Alabama</p><p><b>Bird: </b>Yellowhammer</p><p><b>State: </b>Alaska</p><p><b>Bird: </b>Willow Ptarmigan</p><p><b>State: </b>Arizona</p><p><b>Bird: </b>Cactus Wren</p><p><b>State: </b>Arkansas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>California</p><p><b>Bird: </b>California Valley Quail</p><p><b>State: </b>Colorado</p><p><b>Bird: </b>Lark Bunting</p><p><b>State: </b>Connecticut</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Delaware</p><p><b>Bird: </b>Blue Hen Chicken</p><p><b>State: </b>Florida</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Georgia</p><p><b>Bird: </b>Brown Thrasher</p><p><b>State: </b>Hawaii</p><p><b>Bird: </b>Nene</p><p><b>State: </b>Idaho</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>Illinois</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Indiana</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Iowa</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>Kansas</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Kentucky</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Louisiana</p><p><b>Bird: </b>Eastern Brown Pelican</p><p><b>State: </b>Maine</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Maryland</p><p><b>Bird: </b>Baltimore Oriole</p><p><b>State: </b>Massachusetts</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Michigan</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Minnesota</p><p><b>Bird: </b>Common Loon</p><p><b>State: </b>Mississippi</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Missouri</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>Montana</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nebraska</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nevada</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>New Hampshire</p><p><b>Bird: </b>Purple Finch</p><p><b>State: </b>New Jersey</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>New Mexico</p><p><b>Bird: </b>Roadrunner</p><p><b>State: </b>New York</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>North Carolina</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>North Dakota</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Ohio</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Oklahoma</p><p><b>Bird: </b>Scissor-tailed Flycatcher</p><p><b>State: </b>Oregon</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Pennsylvania</p><p><b>Bird: </b>Ruffed Grouse</p><p><b>State: </b>Rhode Island</p><p><b>Bird: </b>Rhode Island Red</p><p><b>State: </b>South Carolina</p><p><b>Bird: </b>Great Carolina Wren</p><p><b>State: </b>South Dakota</p><p><b>Bird: </b>Ring-necked Pheasant</p><p><b>State: </b>Tennessee</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Texas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Utah</p><p><b>Bird: </b>American Seagull</p><p><b>State: </b>Vermont</p><p><b>Bird: </b>Hermit Thrush</p><p><b>State: </b>Virginia</p><p><b>Bird: </b>Cardinal </p><p><b>State: </b>Washington</p><p><b>Bird: </b>Willow Goldfinch</p><p><b>State: </b>West Virginia</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Wisconsin</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Wyoming</p><p><b>Bird: </b>Western Meadowlark</p></div></div><div id="id2869300" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2869300"/>Chapter 6. Table Tests</h2></div></div><h3>Alternate Alignment on Entry</h3><div class="informaltable" id="id2869334"><p/><a name="id2869334"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table><p/></div><div class="informaltable" id="id2869555"><p/><a name="id2869555"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table><p/></div><div class="informaltable" id="id2869773"><p/><a name="id2869773"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left"><i>left emph</i></td><td align="center"><b>center emph/bold</b></td><td><tt>center literal</tt></td></tr><tr><td align="center"><tt>center filename</tt></td><td align="right"><b>right command</b></td><td align="right">right</td></tr></tbody></table><p/></div><h3>Absolute Widths</h3><div class="informaltable" id="id2870023"><p/><a name="id2870023"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr></tbody></table><p/></div><h3>Relative Widths</h3><div class="informaltable" id="id2870262"><p/><a name="id2870262"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td align="left"><p>left</p></td><td align="center"><p>center</p></td></tr><tr><td align="center"><p>center</p></td><td align="right"><p>right</p></td></tr></tbody></table><p/></div><h3>Complex</h3><div class="informaltable" id="id2870425"><p/><a name="id2870425"/><table width="100%" border="1"><colgroup><col/><col align="right"/><col align="center"/><col/><col/><col align="left"/></colgroup><tbody><tr><td>A1</td><td>A2</td><td>A3</td><td rowspan="2">A4</td><td>A5</td><td>A6</td></tr><tr><td>B1</td><td>B2</td><td>B3</td><td>B5</td><td>B6</td></tr><tr><td>C1</td><td>C2</td><td>C3</td><td>C4</td><td rowspan="3" colspan="2" valign="middle">C5</td></tr><tr><td> </td><td colspan="0">D2</td><td>D3</td><td>D4</td></tr><tr><td>E1</td><td align="left">E2</td><td>E4</td></tr><tr><td>F1</td><td>F2</td><td>F3</td><td>F4</td><td>F5</td><td>F6</td></tr></tbody></table><p/></div><h3>With Footnotes</h3><div class="informaltable" id="id2870884"><p/><a name="id2870884"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>foo<sup>[<a name="fnrex1a" href="#ftn.fnrex1a"></a>]</sup></td><td>3<sup>[<a name="fnrex1b" href="#ftn.fnrex1b">a</a>]</sup></td></tr><tr><td>bar<sup>[<a href="#ftn.fnrex1a"></a>]</sup></td><td>5<sup>[<a href="#ftn.fnrex1b">a</a>]</sup></td></tr></tbody><tr><td colspan="2"><div class="footnote"><p><sup>[<a name="ftn.fnrex1a" href="#fnrex1a"></a>] </sup>A meaningless
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div></div><div class="simplesect"><a name="id2880768"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2880768"/>SimpleLists</h2></div></div><h5>Inline</h5><p>An inline simple list:
+<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span></p><h5>Horiz</h5><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr><tr><td>Seven</td><td>&nbsp;</td><td>&nbsp;</td></tr></table><h5>Vert</h5><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Four</td><td>Seven</td></tr><tr><td>Two</td><td>Five</td><td>&nbsp;</td></tr><tr><td>Three</td><td>Six</td><td>&nbsp;</td></tr></table></div><div class="simplesect"><a name="id2881043"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2881043"/>More Complex List Item Content</h2></div></div><div class="itemizedlist"><ul><li><p><a name="id2881064"/>One</p><p>Second para</p></li><li><p><a name="id2881087"/>Two</p><p>Second para</p></li><li><a name="id2881111"/><p>Three</p><p>Second para</p></li><li><p><a name="id2881134"/>Four</p><p>Second para</p></li><li><a name="id2881158"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2881197"/>Six</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2881221"/>One</p><p>Second para</p></li><li><p><a name="id2881244"/>Two</p><p>Second para</p></li><li><a name="id2881268"/><p>Three</p><p>Second para</p></li><li><p><a name="id2881291"/>Four</p><p>Second para</p></li><li><a name="id2881315"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2881354"/>Six</p></li></ol></div></div><div class="simplesect"><a name="id2881373"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2881373"/>Segmented List</h2></div></div><p><b>State Birds</b></p><p><b>State: </b>Alabama</p><p><b>Bird: </b>Yellowhammer</p><p><b>State: </b>Alaska</p><p><b>Bird: </b>Willow Ptarmigan</p><p><b>State: </b>Arizona</p><p><b>Bird: </b>Cactus Wren</p><p><b>State: </b>Arkansas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>California</p><p><b>Bird: </b>California Valley Quail</p><p><b>State: </b>Colorado</p><p><b>Bird: </b>Lark Bunting</p><p><b>State: </b>Connecticut</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Delaware</p><p><b>Bird: </b>Blue Hen Chicken</p><p><b>State: </b>Florida</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Georgia</p><p><b>Bird: </b>Brown Thrasher</p><p><b>State: </b>Hawaii</p><p><b>Bird: </b>Nene</p><p><b>State: </b>Idaho</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>Illinois</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Indiana</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Iowa</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>Kansas</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Kentucky</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Louisiana</p><p><b>Bird: </b>Eastern Brown Pelican</p><p><b>State: </b>Maine</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Maryland</p><p><b>Bird: </b>Baltimore Oriole</p><p><b>State: </b>Massachusetts</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Michigan</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Minnesota</p><p><b>Bird: </b>Common Loon</p><p><b>State: </b>Mississippi</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Missouri</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>Montana</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nebraska</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nevada</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>New Hampshire</p><p><b>Bird: </b>Purple Finch</p><p><b>State: </b>New Jersey</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>New Mexico</p><p><b>Bird: </b>Roadrunner</p><p><b>State: </b>New York</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>North Carolina</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>North Dakota</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Ohio</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Oklahoma</p><p><b>Bird: </b>Scissor-tailed Flycatcher</p><p><b>State: </b>Oregon</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Pennsylvania</p><p><b>Bird: </b>Ruffed Grouse</p><p><b>State: </b>Rhode Island</p><p><b>Bird: </b>Rhode Island Red</p><p><b>State: </b>South Carolina</p><p><b>Bird: </b>Great Carolina Wren</p><p><b>State: </b>South Dakota</p><p><b>Bird: </b>Ring-necked Pheasant</p><p><b>State: </b>Tennessee</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Texas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Utah</p><p><b>Bird: </b>American Seagull</p><p><b>State: </b>Vermont</p><p><b>Bird: </b>Hermit Thrush</p><p><b>State: </b>Virginia</p><p><b>Bird: </b>Cardinal </p><p><b>State: </b>Washington</p><p><b>Bird: </b>Willow Goldfinch</p><p><b>State: </b>West Virginia</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Wisconsin</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Wyoming</p><p><b>Bird: </b>Western Meadowlark</p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2882567"/>Chapter 6. Table Tests</h2></div></div><h5>Alternate Alignment on Entry</h5><div class="informaltable" id="id2882601"><a name="id2882601"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table></div><div class="informaltable" id="id2882823"><a name="id2882823"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table></div><div class="informaltable" id="id2883040"><a name="id2883040"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left"><i>left emph</i></td><td align="center"><b>center emph/bold</b></td><td><tt>center literal</tt></td></tr><tr><td align="center"><tt>center filename</tt></td><td align="right"><b>right command</b></td><td align="right">right</td></tr></tbody></table></div><h5>Absolute Widths</h5><div class="informaltable" id="id2883291"><a name="id2883291"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr></tbody></table></div><h5>Relative Widths</h5><div class="informaltable" id="id2883530"><a name="id2883530"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td align="left"><p>left</p></td><td align="center"><p>center</p></td></tr><tr><td align="center"><p>center</p></td><td align="right"><p>right</p></td></tr></tbody></table></div><h5>Complex</h5><div class="informaltable" id="id2883693"><a name="id2883693"/><table width="100%" border="1"><colgroup><col/><col align="right"/><col align="center"/><col/><col/><col align="left"/></colgroup><tbody><tr><td>A1</td><td>A2</td><td>A3</td><td rowspan="2">A4</td><td>A5</td><td>A6</td></tr><tr><td>B1</td><td>B2</td><td>B3</td><td>B5</td><td>B6</td></tr><tr><td>C1</td><td>C2</td><td>C3</td><td>C4</td><td rowspan="3" colspan="2" valign="middle">C5</td></tr><tr><td colspan="0">D2</td><td>D3</td><td>D4</td></tr><tr><td>E1</td><td align="left">E2</td><td>E4</td></tr><tr><td>F1</td><td>F2</td><td>F3</td><td>F4</td><td>F5</td><td>F6</td></tr></tbody></table></div><h5>With Footnotes</h5><div class="informaltable" id="id2884152"><a name="id2884152"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>foo<sup>[<a name="fnrex1a" href="#ftn.fnrex1a"></a>]</sup></td><td>3<sup>[<a name="fnrex1b" href="#ftn.fnrex1b">a</a>]</sup></td></tr><tr><td>bar<sup>[<a href="#ftn.fnrex1a"></a>]</sup></td><td>5<sup>[<a href="#ftn.fnrex1b">a</a>]</sup></td></tr></tbody><tr><td colspan="2"><div class="footnote"><p><sup>[<a name="ftn.fnrex1a" href="#fnrex1a"></a>] </sup>A meaningless
word</p></div><div class="footnote"><p><sup>[<a name="ftn.fnrex1b" href="#fnrex1b">a</a>] </sup>A meaningless
-number</p></div></td></tr></table><p/></div><h3>A Big One</h3><div class="informaltable" id="id2871046"><p/><a name="id2871046"/><table border="1"><colgroup><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><thead><tr><th>H1</th><th>H2</th><th>H3</th><th>H4</th><th>H5</th><th>H6</th><th>H7</th><th>H8</th><th>H9</th><th>H10</th><th>H11</th><th>H12</th><th>H13</th><th>H14</th><th>H15</th></tr></thead><tbody><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr></tbody></table><p/></div></div><div id="id2874961" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2874961"/>Chapter 7. Index Term Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2875032">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2875334">Index Term Sect 2</a></dt><dt> <a href="#id2875478">Index Term Sect 3</a></dt></dl></dd></dl></div><p>Test data.</p><a class="indexterm" name="idx1"/><a class="indexterm" name="idx2"/><div class="sect1"><a name="id2875032"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2875032"/><span class="title">Index Term Sect 1</span></h2></div></div><p>Test data.</p><a class="indexterm" name="idx3"/><a class="indexterm" name="fred"/><a class="indexterm" name="idx5"/><a class="indexterm" name="idx6"/><a class="indexterm" name="idx7"/><a class="indexterm" name="idx8"/><a class="indexterm" name="idx9"/><a class="indexterm" name="id2875278"/><a class="indexterm" name="idx11"/><div class="sect2"><a name="id2875334"/><div class="titlepage"><div><h3 class="title"><a name="id2875334"/><span class="title">Index Term Sect 2</span></h3></div></div><p>Test data.</p><a class="indexterm" name="idx12"/><a class="indexterm" name="idx13"/><a class="indexterm" name="idx14"/><a class="indexterm" name="idx15"/></div><div class="sect2"><a name="id2875478"/><div class="titlepage"><div><h3 class="title"><a name="id2875478"/><span class="title">Index Term Sect 3</span></h3></div></div><p>foo</p></div></div></div></div><div class="part" id="part"><div class="titlepage"><div><h1 class="title"><a name="part"/>Part Two Title</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>8. <a href="#id2875530">CmdSynopsis Tests</a></dt><dt>9. <a href="#id2876286">FuncSynopsis Tests</a></dt><dt>10. <a href="#id2876583">Callout Tests</a></dt></dl></div><div id="id2875530" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2875530"/>Chapter 8. CmdSynopsis Tests</h2></div></div><h3>Very Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2875558"><a name="id2875558"/><tt>cd</tt> {<i><tt>directory</tt></i>}</div><h3>Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2875604"><a name="id2875604"/><tt>cal</tt> [-j] [-y] [month [year]]</div><h3>Another Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2875661"><a name="id2875661"/><tt>chgrp</tt> [-R
+number</p></div></td></tr></table></div><h5>A Big One</h5><div class="informaltable" id="id2884314"><a name="id2884314"/><table border="1"><colgroup><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><thead><tr><th>H1</th><th>H2</th><th>H3</th><th>H4</th><th>H5</th><th>H6</th><th>H7</th><th>H8</th><th>H9</th><th>H10</th><th>H11</th><th>H12</th><th>H13</th><th>H14</th><th>H15</th></tr></thead><tbody><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2888229"/>Chapter 7. Index Term Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2888300">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2888602">Index Term Sect 2</a></dt><dt> <a href="#id2888745">Index Term Sect 3</a></dt></dl></dd></dl></div><p>Test data.</p><a class="indexterm" name="idx1"/><a class="indexterm" name="idx2"/><div class="sect1"><a name="id2888300"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2888300"/>Index Term Sect 1</h2></div></div><p>Test data.</p><a class="indexterm" name="idx3"/><a class="indexterm" name="fred"/><a class="indexterm" name="idx5"/><a class="indexterm" name="idx6"/><a class="indexterm" name="idx7"/><a class="indexterm" name="idx8"/><a class="indexterm" name="idx9"/><a class="indexterm" name="id2888546"/><a class="indexterm" name="idx11"/><div class="sect2"><a name="id2888602"/><div class="titlepage"><div><h3 class="title"><a name="id2888602"/>Index Term Sect 2</h3></div></div><p>Test data.</p><a class="indexterm" name="idx12"/><a class="indexterm" name="idx13"/><a class="indexterm" name="idx14"/><a class="indexterm" name="idx15"/></div><div class="sect2"><a name="id2888745"/><div class="titlepage"><div><h3 class="title"><a name="id2888745"/>Index Term Sect 3</h3></div></div><p>foo</p></div></div></div></div><div class="part" id="part"><div class="titlepage"><div><h1 class="title"><a name="part"/>Part Two Title</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>8 <a href="#id2888797">CmdSynopsis Tests</a></dt><dt>9 <a href="#id2889554">FuncSynopsis Tests</a></dt><dt>10 <a href="#id2889850">Callout Tests</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2888797"/>Chapter 8. CmdSynopsis Tests</h2></div></div><h5>Very Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2888826"><a name="id2888826"/><tt>cd</tt> {<i><tt>directory</tt></i>}</div><h5>Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2888871"><a name="id2888871"/><tt>cal</tt> [-j] [-y] [month [year]]</div><h5>Another Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2888929"><a name="id2888929"/><tt>chgrp</tt> [-R
[-H | -L | -P]
- ] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div><h3>Slightly Complex CmdSynopsis</h3><div class="cmdsynopsis" id="id2875772"><a name="id2875772"/><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div><h3>Quite Complex CmdSynopsis</h3><div class="cmdsynopsis" id="id2875903"><a name="id2875903"/><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br/> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br/> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br/> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div></div><div id="id2876286" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2876286"/>Chapter 9. FuncSynopsis Tests</h2></div></div><h3>Two Simple Parameters</h3><div class="funcsynopsis" id="id2876315"><p/><a name="id2876315"/><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br/>int <var class="pdparam">int1</var>;<br/>int <var class="pdparam">int2</var>;</code></p><p/></div><h3>Variable Arguments</h3><div class="funcsynopsis" id="id2876384"><p/><a name="id2876384"/><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p><p/></div><h3>Void</h3><div class="funcsynopsis" id="id2876449"><p/><a name="id2876449"/><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p><p/></div><h3>Function Pointer Arguments</h3><div class="funcsynopsis" id="id2876483"><p/><a name="id2876483"/><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br/>void *<var class="pdparam">dataptr</var>[];<br/>int <var class="pdparam">left</var>;<br/>int <var class="pdparam">right</var>;<br/>int <var class="pdparam">(* comp)</var>
- (void *, void *);</code></p><p/></div></div><div id="id2876583" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2876583"/>Chapter 10. Callout Tests</h2></div></div><h3>CallOut (using AREASPEC)</h3><div class="programlistingco"><pre class="programlisting">@rem = '--*-Perl-*--
+ ] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div><h5>Slightly Complex CmdSynopsis</h5><div class="cmdsynopsis" id="id2889040"><a name="id2889040"/><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div><h5>Quite Complex CmdSynopsis</h5><div class="cmdsynopsis" id="id2889171"><a name="id2889171"/><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br/> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br/> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br/> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2889554"/>Chapter 9. FuncSynopsis Tests</h2></div></div><h5>Two Simple Parameters</h5><div class="funcsynopsis" id="id2889583"><a name="id2889583"/><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br/>int <var class="pdparam">int1</var>;<br/>int <var class="pdparam">int2</var>;</code></p></div><h5>Variable Arguments</h5><div class="funcsynopsis" id="id2889652"><a name="id2889652"/><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p></div><h5>Void</h5><div class="funcsynopsis" id="id2889716"><a name="id2889716"/><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p></div><h5>Function Pointer Arguments</h5><div class="funcsynopsis" id="id2889751"><a name="id2889751"/><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br/>void *<var class="pdparam">dataptr</var>[];<br/>int <var class="pdparam">left</var>;<br/>int <var class="pdparam">right</var>;<br/>int <var class="pdparam">(* comp)</var>
+ (void *, void *);</code></p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2889850"/>Chapter 10. Callout Tests</h2></div></div><h5>CallOut (using AREASPEC)</h5><div class="programlistingco"><pre class="programlisting">@rem = '--*-Perl-*--
@echo off
perl.exe %_batchname %$
goto endofperl
@@ -268,38 +268,38 @@ while (@DIRS) {
}
}
-exit;</pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/1.png" alt="1" border="0"/></td><td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/2.png" alt="2" border="0"/></td><td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
-file interpreter, skips over the body of the Perl script.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/3.png" alt="3" border="0"/></td><td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
-fragments.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/4.png" alt="4" border="0"/></td><td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
+exit;</pre><div class="calloutlist"><a name="id2890058"/><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="id2890067"/><img src="../images/callouts/1.png" alt="1" border="0"/></td><td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890095"/><img src="../images/callouts/2.png" alt="2" border="0"/></td><td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
+file interpreter, skips over the body of the Perl script.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890132"/><img src="../images/callouts/3.png" alt="3" border="0"/></td><td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
+fragments.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890169"/><img src="../images/callouts/4.png" alt="4" border="0"/></td><td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
-both a line and a column.)</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/5.png" alt="5" border="0"/></td><td valign="top" align="left"><p>This is a user subroutine call.</p></td></tr></table></div></div><h3>CallOut (using CO)</h3><pre class="programlisting">this is a line
+both a line and a column.)</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890206"/><img src="../images/callouts/5.png" alt="5" border="0"/></td><td valign="top" align="left"><p>This is a user subroutine call.</p></td></tr></table></div></div><h5>CallOut (using CO)</h5><pre class="programlisting">this is a line
this is another line
there's a <a name="callout1"/><img src="../images/callouts/1.png" alt="1" border="0"/>callout in here.
and there's another on the
next line
-right here:<a name="callout2"/><img src="../images/callouts/2.png" alt="2" border="0"/></pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>First callout.</p><p>Second para in first callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+right here:<a name="callout2"/><img src="../images/callouts/2.png" alt="2" border="0"/></pre><div class="calloutlist"><a name="id2890272"/><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="id2890292"/><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>First callout.</p><p>Second para in first callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890328"/><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Second callout.</p><p>Third para in second callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td></tr></table></div></div></div><div class="part" id="id2877146"><div class="titlepage"><div><h1 class="title"><a name="id2877146"/>A Reference Part</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>I. <a href="#reference">Reference</a></dt></dl></div><div class="reference"><a name="reference"/><div class="titlepage"><div><h1 class="title"><a name="reference"/>Reference</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#id2877183">RefEntryTitle</a></dt><dt><a href="#id2877368"><tt>Chop</tt></a></dt></dl></div><div class="refentry"><h1 class="title"><a name="id2877183"/>RefEntryTitle</h1><div class="refnamediv"><a name="id2877206"/><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div><div class="refsynopsisdiv"><a name="id2877246"/><h2>Synopsis</h2><pre class="synopsis"> A
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Second callout.</p><p>Third para in second callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2890378"/><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td></tr></table></div></div></div><div class="part" id="id2890414"><div class="titlepage"><div><h1 class="title"><a name="id2890414"/>A Reference Part</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>I <a href="#reference">Reference</a></dt><dd><dl><dt><a href="#id2890451">RefEntryTitle</a></dt><dt><a href="#id2890636"><tt>Chop</tt></a></dt></dl></dd></dl></div><div class="reference"><a name="reference"/><div class="titlepage"><div><h1 class="title"><a name="reference"/>Reference</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#id2890451">RefEntryTitle</a></dt><dt><a href="#id2890636"><tt>Chop</tt></a></dt></dl></div><div class="refentry"><h1 class="title"><a name="id2890451"/>RefEntryTitle</h1><div class="refnamediv"><a name="id2890473"/><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div><div class="refsynopsisdiv"><a name="id2890514"/><h2>Synopsis</h2><pre class="synopsis"> A
Synopsis
Goes
- Here</pre></div><div class="refsect1"><a name="id2877262"/><h2><a name="id2877262"/>A RefSect1</h2><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+ Here</pre></div><div class="refsect1"><a name="id2890530"/><h2><a name="id2890530"/>A RefSect1</h2><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect2"><a name="id2877290"/><h3><a name="id2877290"/>A RefSect2</h3><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect2"><a name="id2890558"/><h3><a name="id2890558"/>A RefSect2</h3><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect3"><a name="id2877318"/><h4><a name="id2877318"/>A RefSect3</h4><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect3"><a name="id2890585"/><h4><a name="id2890585"/>A RefSect3</h4><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.<sup>[<a name="id2877340" href="#ftn.id2877340">6</a>]</sup>
+Blah blah blah blah.<sup>[<a name="id2890608" href="#ftn.id2890608">6</a>]</sup>
Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></div></div></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2877340" href="#id2877340">6</a>] </sup>This is a footnote in a refentry.</p></div></div></div><div class="refentry"><h1 class="title"><a name="id2877368"/><tt>Chop</tt></h1><div class="refnamediv"><a name="id2877374"/><h2>Name</h2><tt>Chop</tt> &#x2014; strip trailing whitespace</div><div class="refsect1"><a name="id2877401"/><h2><a name="id2877401"/>Description</h2><p> Returns the argument string without trailing whitespace.
- <div class="example"><p><a name="id2877422"/><b>Example 2. chop() example</b></p><pre class="programlisting">$trimmed = Chop($line);</pre></div>
- </p></div></div></div></div><div id="appendix" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. A Very Short Appendix</h2></div></div><p>Blah.</p></div><div id="id2877488" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2877488"/>Appendix B. A Very Long Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2878138">a sect1 title</a></dt><dd><dl><dt> <a href="#id2878169">a sect2 title</a></dt></dl></dd><dt> <a href="#id2878309">another sect1 title</a></dt><dd><dl><dt> <a href="#id2878363">another sect2 title</a></dt></dl></dd><dt> <a href="#id2878598">another sect1 title</a></dt><dt> <a href="#id2878630">another sect1 title</a></dt></dl></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></div></div></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2890608" href="#id2890608">6</a>] </sup>This is a footnote in a refentry.</p></div></div></div><div class="refentry"><h1 class="title"><a name="id2890636"/><tt>Chop</tt></h1><div class="refnamediv"><a name="id2890642"/><h2>Name</h2><tt>Chop</tt> &#x2014; strip trailing whitespace</div><div class="refsect1"><a name="id2890668"/><h2><a name="id2890668"/>Description</h2><p> Returns the argument string without trailing whitespace.
+ <div class="example"><p><a name="id2890690"/><b>Example 2. chop() example</b></p><pre class="programlisting">$trimmed = Chop($line);</pre></div>
+ </p></div></div></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. A Very Short Appendix</h2></div></div><p>Blah.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2890756"/>Appendix B. A Very Long Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2891406">a sect1 title</a></dt><dd><dl><dt> <a href="#id2891437">a sect2 title</a></dt></dl></dd><dt> <a href="#id2891576">another sect1 title</a></dt><dd><dl><dt> <a href="#id2891631">another sect2 title</a></dt></dl></dd><dt> <a href="#id2891866">another sect1 title</a></dt><dt> <a href="#id2891898">another sect1 title</a></dt></dl></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -483,75 +483,75 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Blah blah b
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="sect1"><a name="id2878138"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2878138"/><span class="title">a sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="sect1"><a name="id2891406"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2891406"/>a sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2878169"/><div class="titlepage"><div><h3 class="title"><a name="id2878169"/><span class="title">a sect2 title</span></h3></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2891437"/><div class="titlepage"><div><h3 class="title"><a name="id2891437"/>a sect2 title</h3></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2878200"/><div class="titlepage"><div><h4 class="title"><a name="id2878200"/><span class="title">a sect3 title</span></h4></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2891467"/><div class="titlepage"><div><h4 class="title"><a name="id2891467"/>a sect3 title</h4></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2878239"/><div class="titlepage"><div><h5 class="title"><a name="id2878239"/><span class="title">a sect4 title</span></h5></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2891507"/><div class="titlepage"><div><h5 class="title"><a name="id2891507"/>a sect4 title</h5></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2878270"/><div class="titlepage"><div><h6 class="title"><a name="id2878270"/><span class="title">a sect5 title</span></h6></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2891537"/><div class="titlepage"><div><h6 class="title"><a name="id2891537"/>a sect5 title</h6></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2878309"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2878309"/><span class="title">another sect1 title</span></h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2891576"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2891582"/>another sect1 title</h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2878363"/><div class="titlepage"><div><h3 class="title"><a name="id2878363"/><span class="title">another sect2 title</span></h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2891631"/><div class="titlepage"><div><h3 class="title"><a name="id2891637"/>another sect2 title</h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2878418"/><div class="titlepage"><div><h4 class="title"><a name="id2878418"/><span class="title">another sect3 title</span></h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2891685"/><div class="titlepage"><div><h4 class="title"><a name="id2891691"/>another sect3 title</h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2878472"/><div class="titlepage"><div><h5 class="title"><a name="id2878472"/><span class="title">another sect4 title</span></h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2891740"/><div class="titlepage"><div><h5 class="title"><a name="id2891746"/>another sect4 title</h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2878526"/><div class="titlepage"><div><h6 class="title"><a name="id2878526"/><span class="title">another sect5 title</span></h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2891794"/><div class="titlepage"><div><h6 class="title"><a name="id2891800"/>another sect5 title</h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2878598"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2878598"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2891866"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2891866"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="id2878630"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2878630"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="id2891898"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2891898"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div><div class="bibliography"><h2 class="title"><a name="bib1">A Test Bibliography</a></h2><p>The stock stylesheet attempts to do a Bibliography. It probably needs
-a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2878698">Books</a></h3><div id="id2878712" class="biblioentry"><a name="id2878712"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2878945">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div><div id="bib1" class="bibliography"><div class="titlepage"><div><h2 class="title"><a name="bib1"/>A Test Bibliography</h2></div></div><p>The stock stylesheet attempts to do a Bibliography. It probably needs
+a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2891966">Books</a></h3><div id="id2891980" class="biblioentry"><a name="id2891980"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2892212">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
&#x201C;Introduction to Cascading Style Sheets&#x201D;.
</span>
<span class="bibliomset"> <I>The World Wide Web Journal</I>.
<span class="volumenum">2</span>(<span class="issuenum">1</span>).
<span class="publishername">O'Reilly &amp; Associates, Inc.</span> and
<span class="corpname">The World Wide Web Consortium</span>.
- <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2879258" class="biblioentry"><a name="id2879258"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
+ <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2892525" class="biblioentry"><a name="id2892525"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
Anywhere, XX 99999
@@ -561,10 +561,10 @@ USA. </span>. </span>. </span><span class="confgroup"><span class="confdates">co
Anywhere, XX 99999
USA. </span><span class="confsponsor">confsponsor. </span>. </span><span class="contractnum">ContractNum. </span><span class="contractsponsor">ContractSponsor. </span><span class="contrib">Contrib. </span><span class="copyright">Copyright © 1998 Copyright holder. </span><span class="corpname">CorpName. </span><span class="date">Date. </span><span class="edition">Edition. </span><span class="editor">EditorFirstName EditorSurname. </span><span class="firstname">FirstName. </span><span class="honorific">Honorific. </span><span class="isbn">ISBN. </span><span class="issn">ISSN. </span><span class="invpartnumber">InvPartNumber. </span><span class="issuenum">IssueNum. </span><span class="lineage">Lineage. </span><span class="orgname">OrgName. </span><span class="othercredit"><span class="firstname">OCFirstName. </span><span class="surname">OCSurname. </span>. </span><span class="othername">OtherName. </span><span class="pagenums">PageNums. </span><span class="productname">ProductName. </span><span class="productnumber">ProductNumber. </span><span class="pubdate">PubDate. </span><span class="publisher"><span class="publishername">PubPublisherName. </span><span class="address">Any Street
Anywhere, XX 99999
-USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesinfo"><span class="title"><I>SeriesInfo Title</I>. </span><span class="editor">SeriesInfo Editor Firstname SeriesInfo Editor Surname. </span></span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div class="glossary"><h2>Example Glossary</h2><dl><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
- Markup Language</a>.</p></dd></div><div class="glossdiv"><h3 class="title">S</h3><dt><a name="id2880198">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
+USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesinfo"><span class="title"><I>SeriesInfo Title</I>. </span><span class="editor">SeriesInfo Editor Firstname SeriesInfo Editor Surname. </span></span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div id="gloss" class="glossary"><div class="titlepage"><div><h2 class="title"><a name="gloss"/>Example Glossary</h2></div></div><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dl><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
+ Markup Language</a>.</p></dd></dl></div><div class="glossdiv"><h3 class="title">S</h3><dl><dt><a name="id2893466">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd><dt><a name="sgml">Standard Generalized
- Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></div></dl></div><div class="index"><h2 class="title"><a name="index">Index</a></h2><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div class="index"><h2 class="title"><a name="id2880682">An Index with a Title</a></h2><div class="indexdiv">Symbols<dl><dt>!,
+ Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></dl></div></div><div id="index" class="index"><div class="titlepage"><div><h2 class="title"><a name="index"/>Index</h2></div></div><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div id="id2893950" class="index"><div class="titlepage"><div><h2 class="title"><a name="id2893950"/>An Index with a Title</h2></div></div><div class="indexdiv">Symbols<dl><dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
</dt><dt>[,
<a href="c3.htm#aen38" target="_top">Index Term Sect 2</a>
diff --git a/tests/docbook/result/xhtml/book3.xhtml b/tests/docbook/result/xhtml/book3.xhtml
index 714cda60..11d9a125 100644
--- a/tests/docbook/result/xhtml/book3.xhtml
+++ b/tests/docbook/result/xhtml/book3.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
+<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
@@ -7,15 +7,15 @@
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
- </p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2753527">Index</a></dt></dl></div><div class="bibliography"><h2 class="title"><a name="bib1">A Test Bibliography</a></h2><p>The stock stylesheet attempts to do a Bibliography. It probably needs
-a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2848670">Books</a></h3><div id="id2848684" class="biblioentry"><a name="id2848684"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2758059">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
+ </p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2766639">Index</a></dt></dl></div><div id="bib1" class="bibliography"><div class="titlepage"><div><h2 class="title"><a name="bib1"/>A Test Bibliography</h2></div></div><p>The stock stylesheet attempts to do a Bibliography. It probably needs
+a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2861939">Books</a></h3><div id="id2888056" class="biblioentry"><a name="id2888056"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2767139">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
&#x201C;Introduction to Cascading Style Sheets&#x201D;.
</span>
<span class="bibliomset"> <I>The World Wide Web Journal</I>.
<span class="volumenum">2</span>(<span class="issuenum">1</span>).
<span class="publishername">O'Reilly &amp; Associates, Inc.</span> and
<span class="corpname">The World Wide Web Consortium</span>.
- <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2760756" class="biblioentry"><a name="id2760756"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
+ <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2769329" class="biblioentry"><a name="id2769329"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
Anywhere, XX 99999
@@ -25,10 +25,10 @@ USA. </span>. </span>. </span><span class="confgroup"><span class="confdates">co
Anywhere, XX 99999
USA. </span><span class="confsponsor">confsponsor. </span>. </span><span class="contractnum">ContractNum. </span><span class="contractsponsor">ContractSponsor. </span><span class="contrib">Contrib. </span><span class="copyright">Copyright © 1998 Copyright holder. </span><span class="corpname">CorpName. </span><span class="date">Date. </span><span class="edition">Edition. </span><span class="editor">EditorFirstName EditorSurname. </span><span class="firstname">FirstName. </span><span class="honorific">Honorific. </span><span class="isbn">ISBN. </span><span class="issn">ISSN. </span><span class="invpartnumber">InvPartNumber. </span><span class="issuenum">IssueNum. </span><span class="lineage">Lineage. </span><span class="orgname">OrgName. </span><span class="othercredit"><span class="firstname">OCFirstName. </span><span class="surname">OCSurname. </span>. </span><span class="othername">OtherName. </span><span class="pagenums">PageNums. </span><span class="productname">ProductName. </span><span class="productnumber">ProductNumber. </span><span class="pubdate">PubDate. </span><span class="publisher"><span class="publishername">PubPublisherName. </span><span class="address">Any Street
Anywhere, XX 99999
-USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div class="glossary"><h2>Example Glossary</h2><dl><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
- Markup Language</a>.</p></dd></div><div class="glossdiv"><h3 class="title">S</h3><dt><a name="id2752992">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
+USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div id="gloss" class="glossary"><div class="titlepage"><div><h2 class="title"><a name="gloss"/>Example Glossary</h2></div></div><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dl><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
+ Markup Language</a>.</p></dd></dl></div><div class="glossdiv"><h3 class="title">S</h3><dl><dt><a name="id2766109">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd><dt><a name="sgml">Standard Generalized
- Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></div></dl></div><div class="index"><h2 class="title"><a name="index">Index</a></h2><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div class="index"><h2 class="title"><a name="id2753527">Index</a></h2><div class="indexdiv">Symbols<dl><dt>!,
+ Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></dl></div></div><div id="index" class="index"><div class="titlepage"><div><h2 class="title"><a name="index"/>Index</h2></div></div><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div id="id2766639" class="index"><div class="titlepage"><div><h2 class="title"><a name="id2766639"/>Index</h2></div></div><div class="indexdiv">Symbols<dl><dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
</dt><dt>[,
<a href="c3.htm#aen38" target="_top">Index Term Sect 2</a>
diff --git a/tests/docbook/result/xhtml/callout.xhtml b/tests/docbook/result/xhtml/callout.xhtml
index fa5e19c0..a729ea87 100644
--- a/tests/docbook/result/xhtml/callout.xhtml
+++ b/tests/docbook/result/xhtml/callout.xhtml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Loops</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section"><a name="dsssl.expr.loop"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="dsssl.expr.loop"/><span class="title">Loops</span></h2></div></div><p>
-<a class="indexterm" name="id2760608"/>
-<a class="indexterm" name="id2760618"/>
-<a class="indexterm" name="id2760628"/>
+<html><head><title>Loops</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section"><a name="dsssl.expr.loop"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="dsssl.expr.loop"/>Loops</h2></div><hr/></div><p>
+<a class="indexterm" name="id2773865"/>
+<a class="indexterm" name="id2773875"/>
+<a class="indexterm" name="id2773884"/>
DSSSL doesn't have any construct that resembles the
for loop that occurs in most imperative languages like C
@@ -15,15 +15,15 @@ Loops in DSSSL use a special form of
(let <a name="dl1"/><img src="../images/callouts/1.png" alt="1" border="0"/>loopvar <a name="dl2"/><img src="../images/callouts/2.png" alt="2" border="0"/>((count 1))
<a name="dl3"/><img src="../images/callouts/3.png" alt="3" border="0"/>(if (&gt; count 10)
<a name="dl4"/><img src="../images/callouts/4.png" alt="4" border="0"/>#t
- (<a name="dl5"/><img src="../images/callouts/5.png" alt="5" border="0"/>loopvar <a name="dl6"/><img src="../images/callouts/6.png" alt="6" border="0"/>(+ count 1))))</pre></p><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a href="#dl1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>This variable controls the loop. It is declared without an
+ (<a name="dl5"/><img src="../images/callouts/5.png" alt="5" border="0"/>loopvar <a name="dl6"/><img src="../images/callouts/6.png" alt="6" border="0"/>(+ count 1))))</pre></p><div class="calloutlist"><a name="id2887985"/><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="id2887992"/><a href="#dl1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>This variable controls the loop. It is declared without an
initial value, immediately after the <tt>let</tt>
-operand.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>
-<a class="indexterm" name="id2753815"/>
+operand.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2771325"/><a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>
+<a class="indexterm" name="id2771350"/>
Any number of additional local variables can be defined after
the loop variable, just as they can in any other
-<tt>let</tt> expression.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#dl3"><img src="../images/callouts/3.png" alt="3" border="0"/></a> </td><td valign="top" align="left"><p>If you ever want the loop to end, you have to put some sort of a
-test in it.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#dl4"><img src="../images/callouts/4.png" alt="4" border="0"/></a> </td><td valign="top" align="left"><p>This is the value that will be returned.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#dl5"><img src="../images/callouts/5.png" alt="5" border="0"/></a> </td><td valign="top" align="left"><p>Note that you iterate the loop by using the loop variable as if
-it was a function name.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#dl6"><img src="../images/callouts/6.png" alt="6" border="0"/></a> </td><td valign="top" align="left"><p>The arguments to this function are the values that
-you want the local variables declared in <a href="#dl2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> to have
+<tt>let</tt> expression.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2771386"/><a href="#dl3"><img src="../images/callouts/3.png" alt="3" border="0"/></a> </td><td valign="top" align="left"><p>If you ever want the loop to end, you have to put some sort of a
+test in it.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2771420"/><a href="#dl4"><img src="../images/callouts/4.png" alt="4" border="0"/></a> </td><td valign="top" align="left"><p>This is the value that will be returned.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2771453"/><a href="#dl5"><img src="../images/callouts/5.png" alt="5" border="0"/></a> </td><td valign="top" align="left"><p>Note that you iterate the loop by using the loop variable as if
+it was a function name.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2766944"/><a href="#dl6"><img src="../images/callouts/6.png" alt="6" border="0"/></a> </td><td valign="top" align="left"><p>The arguments to this function are the values that
+you want the local variables declared in <a href="#dl2" title=""><img src="../images/callouts/2.png" alt="2" border="0"/></a> to have
in the next iteration.</p></td></tr></table></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/chunk.xhtml b/tests/docbook/result/xhtml/chunk.xhtml
index f6a52ce1..f0b0c9a4 100644
--- a/tests/docbook/result/xhtml/chunk.xhtml
+++ b/tests/docbook/result/xhtml/chunk.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799237"><div class="titlepage"><div><h1 class="title"><a name="id2799237"/>Book Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div id="dedication" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="dedication"/>First Dedication</h2></div></div><p>Just a test.</p></div><div id="id2753961" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2753961"/>Dedication</h2></div></div><p>Just a test.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#preface">Foreword</a></dt><dt>1. <a href="#xreftest">XRef Tests</a></dt><dd><dl><dt> <a href="#id2756573">First sect1</a></dt><dt> <a href="#id2756594">Second sect1</a></dt></dl></dd><dt>2. <a href="#chapter">Second Chapter</a></dt><dt>3. <a href="#id2754012">Third Chapter</a></dt><dt>A. <a href="#appendix">First Appendix</a></dt><dt>B. <a href="#id2799373">Second Appendix</a></dt></dl></div><div id="preface" class="preface"><div class="titlepage"><div><h2 class="title"><a name="preface"/>Foreword</h2></div></div><p>This is a test paragraph. (<a href="#chapter">chapter</a>)</p></div><div id="xreftest" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="xreftest"/>Chapter 1. XRef Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2756573">First sect1</a></dt><dt> <a href="#id2756594">Second sect1</a></dt></dl></div><p><a href="#dedication">Dedication</a></p><p><a href="#preface">Preface</a></p><p><a href="#chapter">Chapter</a></p><p><a href="#appendix">Appendix</a></p><div class="sect1"><a name="id2756573"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2756573"/><span class="title">First sect1</span></h2></div></div><p>...</p></div><div class="sect1"><a name="id2756594"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2756594"/><span class="title">Second sect1</span></h2></div></div><p>...</p></div></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 2. Second Chapter</h2></div></div><p>This is a test paragraph.</p></div><div id="id2754012" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2754012"/>Chapter 3. Third Chapter</h2></div></div><p>This is a test paragraph.</p></div><div id="appendix" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p><p>This makes the appendix long. This makes the appendix long.
+<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770548"><div class="titlepage"><div><h1 class="title"><a name="id2770548"/>Bookinfo Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div id="dedication" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="dedication"/>First Dedication</h2></div></div><p>Just a test.</p></div><div id="id2770736" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2770736"/>Dedication</h2></div></div><p>Just a test.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#preface">Foreword</a></dt><dt>1 <a href="#xreftest">XRef Tests</a></dt><dd><dl><dt> <a href="#id2769103">First sect1</a></dt><dt> <a href="#id2769124">Second sect1</a></dt></dl></dd><dt>2 <a href="#chapter">Second Chapter</a></dt><dt>3 <a href="#id2763316">Third Chapter</a></dt><dt>A <a href="#appendix">First Appendix</a></dt><dt>B <a href="#id2767122">Second Appendix</a></dt></dl></div><div id="preface" class="preface"><div class="titlepage"><div><h2 class="title"><a name="preface"/>Foreword</h2></div></div><p>This is a test paragraph. (<a href="#chapter" title="Chapter 2. Second Chapter">chapter</a>)</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="xreftest"/>Chapter 1. XRef Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2769103">First sect1</a></dt><dt> <a href="#id2769124">Second sect1</a></dt></dl></div><p><a href="#dedication">Dedication</a></p><p><a href="#preface" title="Foreword">Preface</a></p><p><a href="#chapter" title="Chapter 2. Second Chapter">Chapter</a></p><p><a href="#appendix" title="Appendix A. First Appendix">Appendix</a></p><div class="sect1"><a name="id2769103"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2769103"/>First sect1</h2></div></div><p>...</p></div><div class="sect1"><a name="id2769124"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2769124"/>Second sect1</h2></div></div><p>...</p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 2. Second Chapter</h2></div></div><p>This is a test paragraph.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2763316"/>Chapter 3. Third Chapter</h2></div></div><p>This is a test paragraph.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p><p>This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
@@ -39,4 +39,4 @@ This makes the appendix long. This makes the appendix long.</p><p>This makes the
This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
This makes the appendix long. This makes the appendix long.
-This makes the appendix long. This makes the appendix long.</p></div><div id="id2799373" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2799373"/>Appendix B. Second Appendix</h2></div></div><p>This is just a test.</p></div></div></body></html>
+This makes the appendix long. This makes the appendix long.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2767122"/>Appendix B. Second Appendix</h2></div></div><p>This is just a test.</p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/classsynop.xhtml b/tests/docbook/result/xhtml/classsynop.xhtml
index fb5ab946..f40a65d8 100644
--- a/tests/docbook/result/xhtml/classsynop.xhtml
+++ b/tests/docbook/result/xhtml/classsynop.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Chapter 1. Class Synopses</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751437" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2751437"/>Chapter 1. Class Synopses</h2></div></div><p>This example is Perl; it's the standard DirHandle module. I've
+<html><head><title>Chapter 1. Class Synopses</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2861853"/>Chapter 1. Class Synopses</h2></div></div><p>This example is Perl; it's the standard DirHandle module. I've
cut out the code, so you'll have to trust me on the parameters.
</p><p>ProgramListing version:</p><pre class="programlisting">
package DirHandle;
diff --git a/tests/docbook/result/xhtml/condition.xhtml b/tests/docbook/result/xhtml/condition.xhtml
index 29d59015..c36edbd8 100644
--- a/tests/docbook/result/xhtml/condition.xhtml
+++ b/tests/docbook/result/xhtml/condition.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
+<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
@@ -7,30 +7,30 @@
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
- </p></div></div><hr/></div><div id="id2848775" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2848775"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
-of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2848788">Preface Title</a></dt><dt>I. <a href="#id2874933">Part One Title</a></dt><dt>II. <a href="#part">Part Two Title</a></dt><dt>III. <a href="#id2889653">A Reference Part</a></dt><dt>A. <a href="#appendix">A Very Short Appendix</a></dt><dt>B. <a href="#id2889995">A Very Long Appendix</a></dt><dd><dl><dt> <a href="#id2890645">a sect1 title</a></dt><dd><dl><dt> <a href="#id2890685">a sect2 title</a></dt></dl></dd><dt> <a href="#id2890816">another sect1 title</a></dt><dd><dl><dt> <a href="#id2890870">another sect2 title</a></dt></dl></dd><dt> <a href="#id2891105">another sect1 title</a></dt><dt> <a href="#id2891138">another sect1 title</a></dt></dl></dd><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2893187">An Index with a Title</a></dt></dl></div><div id="id2848788" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2848788"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div class="part" id="id2874933"><div class="titlepage"><div><h1 class="title"><a name="id2874933"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2848684"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2848705" href="#ftn.id2848705">1</a>]</sup>.</p><div class="sect1"><a name="id2848723"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2848723"/><span class="title">PartIntro Section</span></h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#chapter">XRef Tests</a></dt><dt>2. <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2753594">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2752539">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3. <a href="#id2757673">Inline Tests</a></dt><dt>4. <a href="#id2876276">Block Tests</a></dt><dt>5. <a href="#id2877858">List Tests</a></dt><dt>6. <a href="#id2881436">Table Tests</a></dt><dt>7. <a href="#id2887472">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2887544">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2887846">Index Term Sect 2</a></dt><dt> <a href="#id2887989">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2848705" href="#id2848705">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><h3>Xrefs</h3><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book"><i>Book Title</i></a></td></tr><tr><td><a href="#part">Part II.</a></td></tr><tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr><tr><td><a href="#appendix">Appendix A.</a></td></tr><tr><td><a href="#table">Table 4.0.</a></td></tr><tr><td><a href="#figure">Figure 4.0.</a></td></tr><tr><td><a href="#example">Example 4.0.</a></td></tr><tr><td><a href="#equation">Equation 4.0.</a></td></tr><tr><td><a href="#reference">Reference I.</a></td></tr><tr><td><a href="#bib1">&#x201C;A Test Bibliography&#x201D;</a></td></tr><tr><td><a href="#gloss">&#x201C;Example Glossary&#x201D;</a></td></tr><tr><td><a href="#index">&#x201C;Index&#x201D;</a></td></tr></table><p>This is the first reference to <i>XML</i>.
-This is the second reference to XML.
-These are references without linkend
-attributes: <i>XML</i>, XML.</p><h3>Links</h3><p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
-is available.</p><p>There is <a href="#part">a second part</a> in this book.</p><p>This is the <a href="#chapter"/>
-chapter.</p></div><div id="stchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="stchap"/>Chapter 2. Section Tests</h2></div><div><h2 class="subtitle">Section Tests Subtitle</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2753594">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2752539">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></div><p>some text. some text. some text. some text. some text. some text.
+ </p></div></div><hr/></div><div id="id2599782" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2599782"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
+of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2862028">Preface Title</a></dt><dt>I <a href="#id2888175">Part One Title</a></dt><dd><dl><dt>1 <a href="#chapter">XRef Tests</a></dt><dt>2 <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766135">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766648">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3 <a href="#id2766492">Inline Tests</a></dt><dt>4 <a href="#id2889517">Block Tests</a></dt><dt>5 <a href="#id2891099">List Tests</a></dt><dt>6 <a href="#id2894677">Table Tests</a></dt><dt>7 <a href="#id2900713">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2900784">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2901086">Index Term Sect 2</a></dt><dt> <a href="#id2901230">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></dd><dt>II <a href="#part">Part Two Title</a></dt><dd><dl><dt>8 <a href="#id2901282">CmdSynopsis Tests</a></dt><dt>9 <a href="#id2902039">FuncSynopsis Tests</a></dt><dt>10 <a href="#id2902337">Callout Tests</a></dt></dl></dd><dt>III <a href="#id2902894">A Reference Part</a></dt><dd><dl><dt>I <a href="#reference">Reference</a></dt><dd><dl><dt><a href="#id2902931">RefEntryTitle</a></dt><dt><a href="#id2903116"><tt>Chop</tt></a></dt></dl></dd></dl></dd><dt>A <a href="#appendix">A Very Short Appendix</a></dt><dt>B <a href="#id2903236">A Very Long Appendix</a></dt><dd><dl><dt> <a href="#id2903886">a sect1 title</a></dt><dd><dl><dt> <a href="#id2903926">a sect2 title</a></dt></dl></dd><dt> <a href="#id2904056">another sect1 title</a></dt><dd><dl><dt> <a href="#id2904111">another sect2 title</a></dt></dl></dd><dt> <a href="#id2904346">another sect1 title</a></dt><dt> <a href="#id2904378">another sect1 title</a></dt></dl></dd><dt><a href="#bib1">A Test Bibliography</a></dt><dt><a href="#gloss">Example Glossary</a></dt><dt><a href="#index">Index</a></dt><dt><a href="#id2906428">An Index with a Title</a></dt></dl></div><div id="id2862028" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2862028"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div class="part" id="id2888175"><div class="titlepage"><div><h1 class="title"><a name="id2888175"/>Part One Title</h1></div><div><div class="legalnotice"><p>Foo! A legal notice in a part!</p></div></div></div><div class="partintro"><div><div><h1 class="title"><a name="id2861926"/>PartIntro Title</h1></div></div><p>Partintro content<sup>[<a name="id2861946" href="#ftn.id2861946">1</a>]</sup>.</p><div class="sect1"><a name="id2861964"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2861964"/>PartIntro Section</h2></div></div><p>PartIntros can actually have section content as well.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#chapter">XRef Tests</a></dt><dt>2 <a href="#stchap">Section Tests</a></dt><dd><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766135">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766648">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></dd><dt>3 <a href="#id2766492">Inline Tests</a></dt><dt>4 <a href="#id2889517">Block Tests</a></dt><dt>5 <a href="#id2891099">List Tests</a></dt><dt>6 <a href="#id2894677">Table Tests</a></dt><dt>7 <a href="#id2900713">Index Term Tests</a></dt><dd><dl><dt> <a href="#id2900784">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2901086">Index Term Sect 2</a></dt><dt> <a href="#id2901230">Index Term Sect 3</a></dt></dl></dd></dl></dd></dl></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2861946" href="#id2861946">1</a>] </sup>This is a footnote in a partintro.</p></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><h4>Xrefs</h4><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book" title="Book Title">Book Title</a></td></tr><tr><td><a href="#part" title="Part II. Part Two Title">Part II. Part Two Title</a></td></tr><tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr><tr><td><a href="#appendix" title="Appendix A. A Very Short Appendix">Appendix A. A Very Short Appendix</a></td></tr><tr><td><a href="#table" title="Table 4.0. A Table">Table 4.0. A Table</a></td></tr><tr><td><a href="#figure" title="Figure 4.0. A Figure">Figure 4.0. A Figure</a></td></tr><tr><td><a href="#example" title="Example 4.0. An Example">Example 4.0. An Example</a></td></tr><tr><td><a href="#equation" title="Equation 4.0. An Equation"></a></td></tr><tr><td><a href="#reference" title="Reference">Reference</a></td></tr><tr><td><a href="#bib1" title="A Test Bibliography">A Test Bibliography</a></td></tr><tr><td><a href="#gloss" title="Example Glossary">Example Glossary</a></td></tr><tr><td><a href="#index" title="Index">Index</a></td></tr></table><p>This is the first reference to <i>XML</i>.
+This is the second reference to <a href="#xml"><i>XML</i></a>.
+These are references without <tt>linkend</tt>
+attributes: <i>XML</i>, <i>XML</i>.</p><h4>Links</h4><p>More <a href="http://www.jclark.com/dsssl/" target="_top">DSSSL information</a>
+is available.</p><p>There is <a href="#part" title="Part II. Part Two Title">a second part</a> in this book.</p><p>This is the <a href="#chapter" title="Chapter 1. XRef Tests"/>
+chapter.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="stchap"/>Chapter 2. Section Tests</h2></div><div><h3 class="subtitle"><i>Section Tests Subtitle</i></h3></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#secttest1">a sect1 title</a></dt><dd><dl><dt> <a href="#id2766135">a sect2 title</a></dt></dl></dd><dt> <a href="#secttest2">another sect1 title</a></dt><dd><dl><dt> <a href="#id2766648">another sect2 title</a></dt></dl></dd><dt> <a href="#secttest3">another sect1 title</a></dt><dt> <a href="#secttest4">another sect1 title</a></dt></dl></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752983"/>
-<a class="indexterm" name="id2752999"/>
+<a class="indexterm" name="id2774104"/>
+<a class="indexterm" name="id2774120"/>
-<a class="indexterm" name="id2753014"/>
-<a class="indexterm" name="id2753038"/>
+<a class="indexterm" name="id2774136"/>
+<a class="indexterm" name="id2774159"/>
-<a class="indexterm" name="id2753054"/>
-<a class="indexterm" name="id2753085"/>
+<a class="indexterm" name="id2774175"/>
+<a class="indexterm" name="id2774206"/>
-<a class="indexterm" name="id2753101"/>
-<a class="indexterm" name="id2753124"/>
-<a class="indexterm" name="id2753148"/></p><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2774222"/>
+<a class="indexterm" name="id2774246"/>
+<a class="indexterm" name="id2774269"/></p><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -45,26 +45,26 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect1"><a name="secttest1"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest1"/><span class="title">a sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect1"><a name="secttest1"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest1"/>a sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753255"/>
-<a class="indexterm" name="id2753287"/>
-<a class="indexterm" name="id2753310"/>
+<a class="indexterm" name="id2774377"/>
+<a class="indexterm" name="id2774408"/>
+<a class="indexterm" name="id2774432"/>
-<a class="indexterm" name="id2753326"/>
-<a class="indexterm" name="id2753349"/>
-<a class="indexterm" name="id2753381"/>
+<a class="indexterm" name="id2774447"/>
+<a class="indexterm" name="id2774471"/>
+<a class="indexterm" name="id2774502"/>
-<a class="indexterm" name="id2753396"/>
-<a class="indexterm" name="id2753420"/>
-<a class="indexterm" name="id2753444"/>
-<a class="indexterm" name="id2753475"/>
-<a class="indexterm" name="id2753506"/>
-<a class="indexterm" name="id2753530"/></p><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2774518"/>
+<a class="indexterm" name="id2774542"/>
+<a class="indexterm" name="id2773937"/>
+<a class="indexterm" name="id2766016"/>
+<a class="indexterm" name="id2766047"/>
+<a class="indexterm" name="id2766071"/></p><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
@@ -79,81 +79,81 @@ some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2753594"/><div class="titlepage"><div><h3 class="title"><a name="id2753594"/><span class="title">a sect2 title</span></h3></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2766135"/><div class="titlepage"><div><h3 class="title"><a name="id2766135"/>a sect2 title</h3></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2753625"/><div class="titlepage"><div><h4 class="title"><a name="id2753625"/><span class="title">a sect3 title</span></h4></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2766165"/><div class="titlepage"><div><h4 class="title"><a name="id2766165"/>a sect3 title</h4></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2753654"/>
-<a class="indexterm" name="id2753685"/>
-<a class="indexterm" name="id2753716"/>
+<a class="indexterm" name="id2766194"/>
+<a class="indexterm" name="id2766226"/>
+<a class="indexterm" name="id2766257"/>
-<a class="indexterm" name="id2753732"/>
-<a class="indexterm" name="id2753748"/>
-<a class="indexterm" name="id2753771"/>
-<a class="indexterm" name="id2753803"/>
-<a class="indexterm" name="id2753834"/>
-<a class="indexterm" name="id2753865"/></p><div class="sect4"><a name="id2753880"/><div class="titlepage"><div><h5 class="title"><a name="id2753880"/><span class="title">a sect4 title</span></h5></div></div><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2766273"/>
+<a class="indexterm" name="id2766288"/>
+<a class="indexterm" name="id2766312"/>
+<a class="indexterm" name="id2766343"/>
+<a class="indexterm" name="id2766375"/>
+<a class="indexterm" name="id2766406"/></p><div class="sect4"><a name="id2766421"/><div class="titlepage"><div><h5 class="title"><a name="id2766421"/>a sect4 title</h5></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2753911"/><div class="titlepage"><div><h6 class="title"><a name="id2753911"/><span class="title">a sect5 title</span></h6></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2766452"/><div class="titlepage"><div><h6 class="title"><a name="id2766452"/>a sect5 title</h6></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest2"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest2"/><span class="title">another sect1 title</span></h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest2"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766508"/>another sect1 title</h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-<a class="indexterm" name="id2752446"/>
-<a class="indexterm" name="id2752462"/>
-<a class="indexterm" name="id2752493"/>
-<a class="indexterm" name="id2752524"/></p><div class="sect2"><a name="id2752539"/><div class="titlepage"><div><h3 class="title"><a name="id2752539"/><span class="title">another sect2 title</span></h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+<a class="indexterm" name="id2766555"/>
+<a class="indexterm" name="id2766570"/>
+<a class="indexterm" name="id2766602"/>
+<a class="indexterm" name="id2766633"/></p><div class="sect2"><a name="id2766648"/><div class="titlepage"><div><h3 class="title"><a name="id2766654"/>another sect2 title</h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2758005"/><div class="titlepage"><div><h4 class="title"><a name="id2758005"/><span class="title">another sect3 title</span></h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2766702"/><div class="titlepage"><div><h4 class="title"><a name="id2766709"/>another sect3 title</h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2758059"/><div class="titlepage"><div><h5 class="title"><a name="id2758059"/><span class="title">another sect4 title</span></h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2766757"/><div class="titlepage"><div><h5 class="title"><a name="id2766763"/>another sect4 title</h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2758114"/><div class="titlepage"><div><h6 class="title"><a name="id2758114"/><span class="title">another sect5 title</span></h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2766811"/><div class="titlepage"><div><h6 class="title"><a name="id2766818"/>another sect5 title</h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest3"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest3"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="secttest3"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest3"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="secttest4"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="secttest4"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="secttest4"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="secttest4"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div><div id="id2757673" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2757673"/>Chapter 3. Inline Tests</h2></div></div><div class="simplesect"><a name="id2757748"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2757748"/><span class="title">Testing `Quotes' in a title</span></h2></div></div><p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
-Sort of<sup>[<a name="id2757927" href="#ftn.id2757927">3</a>]</sup>.
-Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Abbrev</td><td>GUIIcon</td><td>SGMLTag (Attribute)</td></tr><tr><td>Acronym</td><td>GUILabel</td><td><tt>SGMLTag</tt> (AttValue)</td></tr><tr><td>Action</td><td>GUIMenu</td><td><tt>SGMLTag</tt> (Element)</td></tr><tr><td>Application</td><td>GUISubMenu</td><td><tt>&lt;/SGMLTag&gt;</tt> (EndTag)</td></tr><tr><td>[Citation]</td><td>Hardware</td><td><tt>&amp;SGMLTag;</tt> (GenEntity)</td></tr><tr><td>CiteRefEntry RefEntryTitle(n)</td><td><p><img src="emc2.gif"/></p></td><td><tt>&amp;#SGMLTag;</tt> (NumCharRef)</td></tr><tr><td><i>Citetitle</i></td><td>Interface</td><td><tt>%SGMLTag;</tt> (ParamEntity)</td></tr><tr><td><tt>ClassName</tt></td><td>InterfaceDefinition</td><td><tt>&lt;?SGMLTag&gt;</tt> (PI)</td></tr><tr><td><b>Command</b></td><td><b>KeyCap</b></td><td><tt>&lt;!--SGMLTag--&gt;</tt> (SGMLComment)</td></tr><tr><td><i>Comment</i> (Comment)</td><td>KeyCode</td><td><tt>&lt;SGMLTag&gt;</tt> (StartTag)</td></tr><tr><td><tt>ComputerOutput</tt></td><td>Key-Combo</td><td><tt>SGMLTag</tt></td></tr><tr><td>Database</td><td>KeySym</td><td><i><tt>StructField</tt></i></td></tr><tr><td>ErrorName</td><td><tt>Literal</tt></td><td>StructName</td></tr><tr><td>ErrorType</td><td>Markup</td><td><sub>Subscript</sub></td></tr><tr><td><tt>&lt;<a href="mailto:Email">Email</a>&gt;</tt></td><td><i>MediaLabel</i></td><td><sup>Superscript</sup></td></tr><tr><td><i>Emphasis</i></td><td>MouseButton</td><td>Symbol</td></tr><tr><td><tt>EnVar</tt></td><td><tt>Option</tt></td><td><tt>SystemItem</tt></td></tr><tr><td>ErrorCode</td><td>[Optional]</td><td>Token</td></tr><tr><td><tt>Filename</tt></td><td><i><tt>Parameter</tt></i></td><td>Trademark</td></tr><tr><td><i>Firstterm</i></td><td>Phrase</td><td>Type</td></tr><tr><td><i>ForeignPhrase</i></td><td><tt>Prompt</tt></td><td><b><tt>UserInput</tt></b></td></tr><tr><td><tt>Function</tt></td><td>Property</td><td><i>WordAsWord</i></td></tr><tr><td>GUIMenuItem</td><td>&#x201C;Quote&#x201D;</td><td>ProductName</td></tr><tr><td>GUIButton</td><td><i><tt>Replaceable</tt></i></td><td>&nbsp;</td></tr><tr><td>GUIButton (with Accel)</td><td>ReturnValue</td><td>&nbsp;</td></tr></table><p>And here are a couple of index terms, as another test (of
+some text. some text. some text. some text. some text. some text. some text. </p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2766492"/>Chapter 3. Inline Tests</h2></div></div><div class="simplesect"><a name="id2766977"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766977"/>Testing &#x2018;Quotes&#x2019; in a title</h2></div></div><p>Footnotes<sup>[<a name="fn1" href="#ftn.fn1">2</a>]</sup> are inlines.
+Sort of<sup>[<a name="id2888501" href="#ftn.id2888501">3</a>]</sup>.
+Another footnote<sup>[<a href="#ftn.fn1">2</a>]</sup>.</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Abbrev</td><td>GUIIcon</td><td><tt>SGMLTag</tt> (Attribute)</td></tr><tr><td>Acronym</td><td>GUILabel</td><td><tt>SGMLTag</tt> (AttValue)</td></tr><tr><td>Action</td><td>GUIMenu</td><td><tt>SGMLTag</tt> (Element)</td></tr><tr><td>Application</td><td>GUISubMenu</td><td><tt>&lt;/SGMLTag&gt;</tt> (EndTag)</td></tr><tr><td>[Citation]</td><td>Hardware</td><td><tt>&amp;SGMLTag;</tt> (GenEntity)</td></tr><tr><td>CiteRefEntry RefEntryTitle(n)</td><td><p><img src="emc2.gif"/></p></td><td><tt>&amp;#SGMLTag;</tt> (NumCharRef)</td></tr><tr><td><i>Citetitle</i></td><td>Interface</td><td><tt>%SGMLTag;</tt> (ParamEntity)</td></tr><tr><td><tt>ClassName</tt></td><td>InterfaceDefinition</td><td><tt>&lt;?SGMLTag&gt;</tt> (PI)</td></tr><tr><td><b>Command</b></td><td><b>KeyCap</b></td><td><tt>&lt;!--SGMLTag--&gt;</tt> (SGMLComment)</td></tr><tr><td><i>Comment</i> (Comment)</td><td>KeyCode</td><td><tt>&lt;SGMLTag&gt;</tt> (StartTag)</td></tr><tr><td><tt>ComputerOutput</tt></td><td>Key-Combo</td><td><tt>SGMLTag</tt></td></tr><tr><td>Database</td><td>KeySym</td><td><i><tt>StructField</tt></i></td></tr><tr><td>ErrorName</td><td><tt>Literal</tt></td><td>StructName</td></tr><tr><td>ErrorType</td><td>Markup</td><td><sub>Subscript</sub></td></tr><tr><td><tt>&lt;<a href="mailto:Email">Email</a>&gt;</tt></td><td><i>MediaLabel</i></td><td><sup>Superscript</sup></td></tr><tr><td><i>Emphasis</i></td><td>MouseButton</td><td>Symbol</td></tr><tr><td><tt>EnVar</tt></td><td><tt>Option</tt></td><td><tt>SystemItem</tt></td></tr><tr><td>ErrorCode</td><td>[Optional]</td><td>Token</td></tr><tr><td><tt>Filename</tt></td><td><i><tt>Parameter</tt></i></td><td>Trademark&#x2122;</td></tr><tr><td><i>Firstterm</i></td><td>Phrase</td><td>Type</td></tr><tr><td><i>ForeignPhrase</i></td><td><tt>Prompt</tt></td><td><b><tt>UserInput</tt></b></td></tr><tr><td><tt>Function</tt></td><td>Property</td><td><i>WordAsWord</i></td></tr><tr><td>GUIMenuItem</td><td>&#x201C;Quote&#x201D;</td><td>ProductName</td></tr><tr><td>GUIButton</td><td><i><tt>Replaceable</tt></i></td><td>&nbsp;</td></tr><tr><td>GUIButton (with Accel)</td><td>ReturnValue</td><td>&nbsp;</td></tr></table><p>And here are a couple of index terms, as another test (of
index terms, not inlines).
-<a class="indexterm" name="id2876227"/>
-<a class="indexterm" name="id2876250"/></p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div><div class="footnote"><p><sup>[<a name="ftn.id2757927" href="#id2757927">3</a>] </sup>Well, the marks are, anyway!</p></div></div></div><div id="id2876276" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2876276"/>Chapter 4. Block Tests</h2></div></div><div class="simplesect"><a name="id2876290"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2876290"/><span class="title">Formal Objects</span></h2></div></div><h3>Example</h3><div class="example"><p><a name="example"/><b>Example 4.0. An Example</b></p><p>This is an example of a trivial example.</p></div><h3>Figure</h3><div class="figure"><p><a name="figure"/><b>Figure 4.0. A Figure</b></p><pre class="screen">This is an example of a trivial figure.</pre></div><h3>Equation</h3><div class="equation"><p><a name="equation"/><b>Equation 4.0. An Equation</b></p><p><img src="emc2.gif"/></p></div><h3>Table</h3><div class="table"><p><a name="table"/><b>Table 4.0. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2876600"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2876600"/><span class="title">Informal Objects</span></h2></div></div><h3>InformalExample</h3><div class="informalexample" id="iexample"><p/><a name="iexample"/><p>This is an example of a trivial, informal example.</p><p/></div><h3>InformalEquation</h3><div class="informalequation" id="iequation"><p/><a name="iequation"/><p><img src="emc2.gif"/></p><p/></div><h3>InformalTable</h3><div class="informaltable" id="itable"><p/><a name="itable"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>8</td></tr><tr><td>3</td><td>27</td></tr></tbody></table><p/></div></div><div class="simplesect"><a name="id2876824"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2876824"/><span class="title">Admonitions</span></h2></div></div><h3>Note</h3><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876852">Note</a></h3><p>Consider yourself noted.</p><p>Second para.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876875">Note</a></h3><p>Consider yourself noted, simply.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876892">NoteTitle</a></h3><p>Consider yourself noted.</p><p>Second para, with a title.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876924">Att</a></h3><p>Consider yourself noted, simply.</p><p>With a title</p></div><h3>Important</h3><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876970">Important</a></h3><p>Consider yourself important.</p></div><h3>Tip</h3><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876988">Tip</a></h3><p>Consider yourself tipped.</p></div><h3>Warning</h3><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877029">Warning</a></h3><p>Consider yourself warned.</p></div><h3>Caution</h3><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877058">Caution</a></h3><p>Consider yourself cautioned.</p></div><h3>SimPara in Caution</h3><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877088">Simple Caution</a></h3><p>A simpler caution.</p></div></div><div class="simplesect"><a name="id2877113"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2877113"/><span class="title">Other Objects</span></h2></div></div><h3>Screen</h3><pre class="screen">This
+<a class="indexterm" name="id2889468"/>
+<a class="indexterm" name="id2889491"/></p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.fn1" href="#fn1">2</a>] </sup>Like this!</p></div><div class="footnote"><p><sup>[<a name="ftn.id2888501" href="#id2888501">3</a>] </sup>Well, the marks are, anyway!</p></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2889517"/>Chapter 4. Block Tests</h2></div></div><div class="simplesect"><a name="id2889531"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2889531"/>Formal Objects</h2></div></div><h5>Example</h5><div class="example"><p><a name="example"/><b>Example 4.0. An Example</b></p><p>This is an example of a trivial example.</p></div><h5>Figure</h5><div class="figure"><p><a name="figure"/><b>Figure 4.0. A Figure</b></p><pre class="screen">This is an example of a trivial figure.</pre></div><h5>Equation</h5><div class="equation"><p><a name="equation"/><b>Equation 4.0. An Equation</b></p><p><img src="emc2.gif"/></p></div><h5>Table</h5><div class="table"><p><a name="table"/><b>Table 4.0. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2889841"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2889841"/>Informal Objects</h2></div></div><h5>InformalExample</h5><div class="informalexample" id="iexample"><a name="iexample"/><p>This is an example of a trivial, informal example.</p></div><h5>InformalEquation</h5><div class="informalequation" id="iequation"><a name="iequation"/><p><img src="emc2.gif"/></p></div><h5>InformalTable</h5><div class="informaltable" id="itable"><a name="itable"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>8</td></tr><tr><td>3</td><td>27</td></tr></tbody></table></div></div><div class="simplesect"><a name="id2890065"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2890065"/>Admonitions</h2></div></div><h5>Note</h5><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890093"/>Note</h3><p>Consider yourself noted.</p><p>Second para.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890116"/>Note</h3><p>Consider yourself noted, simply.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890133"/>NoteTitle</h3><p>Consider yourself noted.</p><p>Second para, with a title.</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890165"/>Att</h3><p>Consider yourself noted, simply.</p><p>With a title</p></div><h5>Important</h5><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890211"/>Important</h3><p>Consider yourself important.</p></div><h5>Tip</h5><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890230"/>Tip</h3><p>Consider yourself tipped.</p></div><h5>Warning</h5><div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890270"/>Warning</h3><p>Consider yourself warned.</p></div><h5>Caution</h5><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890300"/>Caution</h3><p>Consider yourself cautioned.</p></div><h5>SimPara in Caution</h5><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2890329"/>Simple Caution</h3><p>A simpler caution.</p></div></div><div class="simplesect"><a name="id2890354"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2890354"/>Other Objects</h2></div></div><h5>Screen</h5><pre class="screen">This
is With a line-annotation
a
screen
@@ -164,10 +164,10 @@ screen
This
is With a line-annotation
a
- screen</pre><h3>ProgramListing</h3><pre class="programlisting">This
+ screen</pre><h5>ProgramListing</h5><pre class="programlisting">This
is
a
-programlisting</pre><h3>Address</h3><div class="address">Norman Walsh<br/>
+programlisting</pre><h5>Address</h5><div class="address">Norman Walsh<br/>
ArborText, Inc.<br/>
1000 Victors Way<br/>
Ann Arbor, MI 48108<br/>
@@ -177,69 +177,69 @@ Voice: 313.997.0200<br/>
Fax: 313.997.0201<br/>
<br/>
Email: <tt>&lt;<a href="mailto:nwalsh@arbortext.com">nwalsh@arbortext.com</a>&gt;</tt><br/>
-WWW: http://www.arbortext.com/</div><h3>BlockQuote</h3><blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
+WWW: http://www.arbortext.com/</div><h5>BlockQuote</h5><blockquote class="blockquote"><p>The universe that we observe has precisely the properties we should
expect if there is, at bottom, no design, no purpose, no evil and
-no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote><h3>Procedure</h3><div class="procedure"><ol><li><p>This is the first step</p></li><li><p>This is the second step</p><ol><li><p>This is the first substep</p></li><li><p>This is the second substep</p></li></ol></li><li><p>This is the third step</p></li></ol></div><h3>Procedure With Title</h3><div class="procedure"><p><b>Same Procedure with a Title</b></p><ol><li><p>This is the first step</p></li><li><p>This is the second step</p><ol><li><p>This is the first substep</p></li><li><p>This is the second substep</p></li></ol></li><li><p>This is the third step</p></li></ol></div><h3>SideBar</h3><div class="sidebar"><a name="id2877578"/><p class="title"><b>What About Bob?</b></p><p>This is a sidebar.</p></div><h3>MsgSet</h3><p>It's not really clear how <tt>MsgSet</tt> should be presented.
-I expect that it's fairly application, if not document, specific.</p><div class="msgentry"><a name="id2877638"/><div class="msg"><a name="id2877644"/><p>Record failed CRC</p><p>Record <i><tt>n</tt></i>
+no good, nothing but pitiless indifference.&#x2014;Richard Dawkins</p></blockquote><h5>Procedure</h5><div class="procedure"><a name="id2890597"/><ol><li><a name="id2890603"/><p>This is the first step</p></li><li><a name="id2890619"/><p>This is the second step</p><ol type="a"><li><a name="id2890640"/><p>This is the first substep</p></li><li><a name="id2890656"/><p>This is the second substep</p></li></ol></li><li><a name="id2890578"/><p>This is the third step</p></li></ol></div><h5>Procedure With Title</h5><div class="procedure"><a name="id2890701"/><p><b>Same Procedure with a Title</b></p><ol><li><a name="id2890715"/><p>This is the first step</p></li><li><a name="id2890731"/><p>This is the second step</p><ol type="a"><li><a name="id2890751"/><p>This is the first substep</p></li><li><a name="id2890767"/><p>This is the second substep</p></li></ol></li><li><a name="id2890786"/><p>This is the third step</p></li></ol></div><h5>SideBar</h5><div class="sidebar"><a name="id2890819"/><p class="title"><b>What About Bob?</b></p><p>This is a sidebar.</p></div><h5>MsgSet</h5><p>It's not really clear how <tt>MsgSet</tt> should be presented.
+I expect that it's fairly application, if not document, specific.</p><div class="msgentry"><a name="id2890879"/><div class="msg"><a name="id2890885"/><p>Record failed CRC</p><p>Record <i><tt>n</tt></i>
in <i><tt>database</tt></i></p><p>File read error on
- <i><tt>database</tt></i></p><p>Panic! Corrupt record!</p></div><div class="msginfo"><a name="id2877767"/><p><b>Level: </b>severe</p><p><b>Origin: </b>server</p><p><b>Audience: </b>all</p></div><div class="msgexplan"><a name="id2877798"/><p> Indicates that some sort of error occured attempting to load
+ <i><tt>database</tt></i></p><p>Panic! Corrupt record!</p></div><div class="msginfo"><a name="id2891008"/><p><b>Level: </b>severe</p><p><b>Origin: </b>server</p><p><b>Audience: </b>all</p></div><div class="msgexplan"><a name="id2891039"/><p> Indicates that some sort of error occured attempting to load
a record from the database. Retry. If failure persists,
contact the database administrator.
- </p></div></div><h3>LiteralLayout</h3><div class="literallayout">This is a<br/>
+ </p></div></div><h5>LiteralLayout</h5><div class="literallayout">This is a<br/>
literal<br/>
       layout</div><p><div class="literallayout">This is a<br/>
literal<br/>
       layout<br/>
-  in a para</div></p></div></div><div id="id2877858" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2877858"/>Chapter 5. List Tests</h2></div></div><div class="simplesect"><a name="id2877872"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2877872"/><span class="title">OrderedLists</span></h2></div></div><h3>Default Numeration</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2877906"/>One</p></li><li><a name="id2877922"/><pre class="programlisting">this one starts with
+  in a para</div></p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2891099"/>Chapter 5. List Tests</h2></div></div><div class="simplesect"><a name="id2891113"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2891113"/>OrderedLists</h2></div></div><h5>Default Numeration</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2891147"/>One</p></li><li><a name="id2891162"/><pre class="programlisting">this one starts with
a program listing
-what happens?</pre></li><li><a name="id2877939"/><pre class="synopsis">this one starts with
+what happens?</pre></li><li><a name="id2891179"/><pre class="synopsis">this one starts with
a synopsis
-what happens?</pre></li><li><p><a name="id2877955"/>para first</p><pre class="synopsis">this one has
+what happens?</pre></li><li><p><a name="id2891196"/>para first</p><pre class="synopsis">this one has
a synopsis
-what happens?</pre></li><li><p><a name="id2877979"/>Three</p><pre class="screen">A
+what happens?</pre></li><li><p><a name="id2891220"/>Three</p><pre class="screen">A
Screen
-Here</pre></li><li><p><a name="id2878003"/>Four</p></li></ol></div><h3>Arabic Numeration</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2878036"/>One</p></li><li><p><a name="id2878062"/>Two</p></li><li><p><a name="id2878076"/>Three</p></li><li><p><a name="id2878092"/>Four</p></li></ol></div><h3>Arabic Numeration (Long)</h3><div class="orderedlist"><ol type="1"><li><p><a name="id2878125"/>One</p></li><li><p><a name="id2878151"/>Two</p></li><li><p><a name="id2878167"/>Three</p></li><li><p><a name="id2878182"/>Four</p></li><li><p><a name="id2878198"/>Five</p></li><li><p><a name="id2878214"/>Six</p></li><li><p><a name="id2878229"/>Seven</p></li><li><p><a name="id2878245"/>Eight</p></li><li><p><a name="id2878261"/>Nine</p></li><li><p><a name="id2878276"/>Ten</p></li><li><p><a name="id2878292"/>Eleven</p></li></ol></div><h3>UpperAlpha Numeration</h3><div class="orderedlist"><ol type="A"><li><p><a name="id2878325"/>One</p></li><li><p><a name="id2878351"/>Two</p></li><li><p><a name="id2878367"/>Three</p></li><li><p><a name="id2878382"/>Four</p></li></ol></div><h3>LowerAlpha Numeration</h3><div class="orderedlist"><ol type="a"><li><p><a name="id2878415"/>One</p></li><li><p><a name="id2878441"/>Two</p></li><li><p><a name="id2878457"/>Three</p></li><li><p><a name="id2878472"/>Four</p></li></ol></div><h3>UpperRoman Numeration</h3><div class="orderedlist"><ol type="I"><li><p><a name="id2878505"/>One</p></li><li><p><a name="id2878531"/>Two</p></li><li><p><a name="id2878547"/>Three</p></li><li><p><a name="id2878563"/>Four</p></li></ol></div><h3>LowerRoman Numeration</h3><div class="orderedlist"><ol type="i"><li><p><a name="id2878596"/>One</p></li><li><p><a name="id2878621"/>Two</p></li><li><p><a name="id2878637"/>Three</p></li><li><p><a name="id2878653"/>Four</p></li></ol></div><h3>Continued</h3><p>First list:
-<div class="orderedlist"><ol type="1"><li><p><a name="id2878696"/>One</p></li><li><p><a name="id2878712"/>Two</p></li><li><p><a name="id2878728"/>Three</p></li><li><p><a name="id2878743"/>Four</p></li></ol></div></p><p>Second list:
-<div class="orderedlist"><ol start="5" type="1"><li><p><a name="id2878768"/>Five</p></li><li><p><a name="id2878793"/>Six</p></li><li><p><a name="id2878809"/>Seven</p></li><li><p><a name="id2878825"/>Eight</p></li><li><p><a name="id2878840"/>Nine</p></li><li><p><a name="id2878856"/>Ten</p></li></ol></div></p></div><div class="simplesect"><a name="id2878874"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2878874"/><span class="title">ItemizedLists</span></h2></div></div><h3>Default Presentation</h3><div class="itemizedlist"><ul><li><p><a name="id2878908"/>One</p></li><li><a name="id2878924"/><pre class="programlisting">One-point-five. This one starts with
+Here</pre></li><li><p><a name="id2891244"/>Four</p></li></ol></div><h5>Arabic Numeration</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2891277"/>One</p></li><li><p><a name="id2891302"/>Two</p></li><li><p><a name="id2891317"/>Three</p></li><li><p><a name="id2891333"/>Four</p></li></ol></div><h5>Arabic Numeration (Long)</h5><div class="orderedlist"><ol type="1"><li><p><a name="id2891366"/>One</p></li><li><p><a name="id2891392"/>Two</p></li><li><p><a name="id2891407"/>Three</p></li><li><p><a name="id2891423"/>Four</p></li><li><p><a name="id2891439"/>Five</p></li><li><p><a name="id2891454"/>Six</p></li><li><p><a name="id2891470"/>Seven</p></li><li><p><a name="id2891486"/>Eight</p></li><li><p><a name="id2891502"/>Nine</p></li><li><p><a name="id2891517"/>Ten</p></li><li><p><a name="id2891533"/>Eleven</p></li></ol></div><h5>UpperAlpha Numeration</h5><div class="orderedlist"><ol type="A"><li><p><a name="id2891566"/>One</p></li><li><p><a name="id2891592"/>Two</p></li><li><p><a name="id2891607"/>Three</p></li><li><p><a name="id2891623"/>Four</p></li></ol></div><h5>LowerAlpha Numeration</h5><div class="orderedlist"><ol type="a"><li><p><a name="id2891656"/>One</p></li><li><p><a name="id2891682"/>Two</p></li><li><p><a name="id2891698"/>Three</p></li><li><p><a name="id2891713"/>Four</p></li></ol></div><h5>UpperRoman Numeration</h5><div class="orderedlist"><ol type="I"><li><p><a name="id2891746"/>One</p></li><li><p><a name="id2891772"/>Two</p></li><li><p><a name="id2891788"/>Three</p></li><li><p><a name="id2891803"/>Four</p></li></ol></div><h5>LowerRoman Numeration</h5><div class="orderedlist"><ol type="i"><li><p><a name="id2891836"/>One</p></li><li><p><a name="id2891862"/>Two</p></li><li><p><a name="id2891878"/>Three</p></li><li><p><a name="id2891894"/>Four</p></li></ol></div><h5>Continued</h5><p>First list:
+<div class="orderedlist"><ol type="1"><li><p><a name="id2891937"/>One</p></li><li><p><a name="id2891953"/>Two</p></li><li><p><a name="id2891968"/>Three</p></li><li><p><a name="id2891984"/>Four</p></li></ol></div></p><p>Second list:
+<div class="orderedlist"><ol start="5" type="1"><li><p><a name="id2892009"/>Five</p></li><li><p><a name="id2892034"/>Six</p></li><li><p><a name="id2892050"/>Seven</p></li><li><p><a name="id2892066"/>Eight</p></li><li><p><a name="id2892081"/>Nine</p></li><li><p><a name="id2892097"/>Ten</p></li></ol></div></p></div><div class="simplesect"><a name="id2892115"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2892115"/>ItemizedLists</h2></div></div><h5>Default Presentation</h5><div class="itemizedlist"><ul><li><p><a name="id2892149"/>One</p></li><li><a name="id2892165"/><pre class="programlisting">One-point-five. This one starts with
a program listing
-what happens?</pre></li><li><p><a name="id2878942"/>Two</p></li><li><p><a name="id2878957"/>Three</p></li><li><p><a name="id2878973"/>Four</p></li></ul></div><h3>Block Elements in a List</h3><div class="itemizedlist"><ul><li><p><a name="id2879010"/>One</p><p>Another para.</p></li><li><p><a name="id2879034"/>Two</p></li><li><p><a name="id2879050"/>Three</p></li><li><p><a name="id2879065"/>Four</p></li></ul></div><h3>Alternate Mark and OverRide</h3><div class="itemizedlist"><ul><li><p><a name="id2879099"/>TeX and LaTeX</p></li><li style="list-style-type: disc"><p><a name="id2879129"/>Troff</p></li><li><p><a name="id2879145"/>Lout</p></li><li style="list-style-type: none"><p><a name="id2879166"/>Test</p></li></ul></div><h3>No mark Presentation</h3><div class="itemizedlist"><ul><li style="list-style-type: none"><p><a name="id2879214"/>One</p></li><li style="list-style-type: disc"><p><a name="id2879234"/>Two</p></li><li><p><a name="id2879249"/>Three</p></li><li><p><a name="id2879265"/>Four</p></li></ul></div></div><div class="simplesect"><a name="id2879284"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2879284"/><span class="title">VariableLists</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2879305"/><span class="term">Term1</span></dt><dd><p><a name="id2879319"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+what happens?</pre></li><li><p><a name="id2892182"/>Two</p></li><li><p><a name="id2892198"/>Three</p></li><li><p><a name="id2892214"/>Four</p></li></ul></div><h5>Block Elements in a List</h5><div class="itemizedlist"><ul><li><p><a name="id2892251"/>One</p><p>Another para.</p></li><li><p><a name="id2892275"/>Two</p></li><li><p><a name="id2892290"/>Three</p></li><li><p><a name="id2892306"/>Four</p></li></ul></div><h5>Alternate Mark and OverRide</h5><div class="itemizedlist"><ul><li><p><a name="id2892340"/>TeX and LaTeX</p></li><li style="list-style-type: disc"><p><a name="id2892370"/>Troff</p></li><li><p><a name="id2892386"/>Lout</p></li><li style="list-style-type: none"><p><a name="id2892406"/>Test</p></li></ul></div><h5>No mark Presentation</h5><div class="itemizedlist"><ul><li style="list-style-type: none"><p><a name="id2892455"/>One</p></li><li style="list-style-type: disc"><p><a name="id2892474"/>Two</p></li><li><p><a name="id2892490"/>Three</p></li><li><p><a name="id2892506"/>Four</p></li></ul></div></div><div class="simplesect"><a name="id2892525"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2892525"/>VariableLists</h2></div></div><div class="variablelist"><dl><dt><a name="id2892546"/><span class="term">Term1</span></dt><dd><p><a name="id2892560"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2879343"/><span class="term">Term2</span></dt><dd><p><a name="id2879357"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2892584"/><span class="term">Term2</span></dt><dd><p><a name="id2892598"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2879380"/><span class="term">Term3</span></dt><dd><p><a name="id2879395"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2892621"/><span class="term">Term3</span></dt><dd><p><a name="id2892635"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="itemizedlist"><ul><li><p><a name="id2879421"/>One</p></li><li><p><a name="id2879437"/>Two</p></li><li><p><a name="id2879452"/>Three</p></li><li><p><a name="id2879468"/>Four</p></li></ul></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="itemizedlist"><ul><li><p><a name="id2892662"/>One</p></li><li><p><a name="id2892678"/>Two</p></li><li><p><a name="id2892693"/>Three</p></li><li><p><a name="id2892709"/>Four</p></li></ul></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2879503"/><span class="term">Term4</span></dt><dd><p><a name="id2879517"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2892744"/><span class="term">Term4</span></dt><dd><p><a name="id2892758"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div><div class="variablelist"><dl><dt><a name="id2879549"/><span class="term">Another List</span></dt><dd><p><a name="id2879563"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div><div class="variablelist"><dl><dt><a name="id2892790"/><span class="term">Another List</span></dt><dd><p><a name="id2892804"/>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2879587"/><span class="term">ProgramListing</span></dt><dd><pre class="programlisting">A ProgramListing
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd><dt><a name="id2892828"/><span class="term">ProgramListing</span></dt><dd><pre class="programlisting">A ProgramListing
Is the First Element
of this VarListEntry</pre><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div></div><div class="simplesect"><a name="id2879637"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2879637"/><span class="title">SimpleLists</span></h2></div></div><h3>Inline</h3><p>An inline simple list:
-<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span></p><h3>Horiz</h3><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr><tr><td>Seven</td><td>&nbsp;</td><td>&nbsp;</td></tr></table><h3>Vert</h3><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Four</td><td>Seven</td></tr><tr><td>Two</td><td>Five</td><td>&nbsp;</td></tr><tr><td>Three</td><td>Six</td><td>&nbsp;</td></tr></table></div><div class="simplesect"><a name="id2879911"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2879911"/><span class="title">More Complex List Item Content</span></h2></div></div><div class="itemizedlist"><ul><li><p><a name="id2879932"/>One</p><p>Second para</p></li><li><p><a name="id2879956"/>Two</p><p>Second para</p></li><li><a name="id2879979"/><p>Three</p><p>Second para</p></li><li><p><a name="id2880003"/>Four</p><p>Second para</p></li><li><a name="id2880026"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2880066"/>Six</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2880089"/>One</p><p>Second para</p></li><li><p><a name="id2880113"/>Two</p><p>Second para</p></li><li><a name="id2880136"/><p>Three</p><p>Second para</p></li><li><p><a name="id2880160"/>Four</p><p>Second para</p></li><li><a name="id2880184"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2880223"/>Six</p></li></ol></div></div><div class="simplesect"><a name="id2880242"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2880242"/><span class="title">Segmented List</span></h2></div></div><p><b>State Birds</b></p><p><b>State: </b>Alabama</p><p><b>Bird: </b>Yellowhammer</p><p><b>State: </b>Alaska</p><p><b>Bird: </b>Willow Ptarmigan</p><p><b>State: </b>Arizona</p><p><b>Bird: </b>Cactus Wren</p><p><b>State: </b>Arkansas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>California</p><p><b>Bird: </b>California Valley Quail</p><p><b>State: </b>Colorado</p><p><b>Bird: </b>Lark Bunting</p><p><b>State: </b>Connecticut</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Delaware</p><p><b>Bird: </b>Blue Hen Chicken</p><p><b>State: </b>Florida</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Georgia</p><p><b>Bird: </b>Brown Thrasher</p><p><b>State: </b>Hawaii</p><p><b>Bird: </b>Nene</p><p><b>State: </b>Idaho</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>Illinois</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Indiana</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Iowa</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>Kansas</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Kentucky</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Louisiana</p><p><b>Bird: </b>Eastern Brown Pelican</p><p><b>State: </b>Maine</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Maryland</p><p><b>Bird: </b>Baltimore Oriole</p><p><b>State: </b>Massachusetts</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Michigan</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Minnesota</p><p><b>Bird: </b>Common Loon</p><p><b>State: </b>Mississippi</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Missouri</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>Montana</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nebraska</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nevada</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>New Hampshire</p><p><b>Bird: </b>Purple Finch</p><p><b>State: </b>New Jersey</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>New Mexico</p><p><b>Bird: </b>Roadrunner</p><p><b>State: </b>New York</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>North Carolina</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>North Dakota</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Ohio</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Oklahoma</p><p><b>Bird: </b>Scissor-tailed Flycatcher</p><p><b>State: </b>Oregon</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Pennsylvania</p><p><b>Bird: </b>Ruffed Grouse</p><p><b>State: </b>Rhode Island</p><p><b>Bird: </b>Rhode Island Red</p><p><b>State: </b>South Carolina</p><p><b>Bird: </b>Great Carolina Wren</p><p><b>State: </b>South Dakota</p><p><b>Bird: </b>Ring-necked Pheasant</p><p><b>State: </b>Tennessee</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Texas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Utah</p><p><b>Bird: </b>American Seagull</p><p><b>State: </b>Vermont</p><p><b>Bird: </b>Hermit Thrush</p><p><b>State: </b>Virginia</p><p><b>Bird: </b>Cardinal </p><p><b>State: </b>Washington</p><p><b>Bird: </b>Willow Goldfinch</p><p><b>State: </b>West Virginia</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Wisconsin</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Wyoming</p><p><b>Bird: </b>Western Meadowlark</p></div></div><div id="id2881436" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2881436"/>Chapter 6. Table Tests</h2></div></div><h3>Alternate Alignment on Entry</h3><div class="informaltable" id="id2881470"><p/><a name="id2881470"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table><p/></div><div class="informaltable" id="id2881692"><p/><a name="id2881692"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table><p/></div><div class="informaltable" id="id2881909"><p/><a name="id2881909"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left"><i>left emph</i></td><td align="center"><b>center emph/bold</b></td><td><tt>center literal</tt></td></tr><tr><td align="center"><tt>center filename</tt></td><td align="right"><b>right command</b></td><td align="right">right</td></tr></tbody></table><p/></div><h3>Absolute Widths</h3><div class="informaltable" id="id2882160"><p/><a name="id2882160"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr></tbody></table><p/></div><h3>Relative Widths</h3><div class="informaltable" id="id2882398"><p/><a name="id2882398"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td align="left"><p>left</p></td><td align="center"><p>center</p></td></tr><tr><td align="center"><p>center</p></td><td align="right"><p>right</p></td></tr></tbody></table><p/></div><h3>Too many cells</h3><p>This is a broken table. There are too many cells in the second row.
-YMMV. Don't do this.</p><div class="informaltable" id="id2882567"><p/><a name="id2882567"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td></tr></tbody></table><p/></div><h3>Missing Entrys</h3><div class="table"><p><a name="t1"/><b>Table 6.0. Table Title</b></p><table summary="Table Title" width="100%" border="1"><colgroup><col/><col/><col/></colgroup><thead><tr><th><p>head1</p></th><th><p>head2</p></th><th><p>head3</p></th></tr></thead><tbody><tr><td><p>a1</p></td><td><p>a2</p></td><td><p>a3</p></td></tr><tr><td><p>b1</p></td><td> </td><td><p>b3</p></td></tr><tr><td> </td><td colspan="0"><p>c2</p></td><td><p>c3</p></td></tr></tbody></table></div><h3>Complex</h3><div class="informaltable" id="id2882952"><p/><a name="id2882952"/><table width="100%" border="1"><colgroup><col/><col align="right"/><col align="center"/><col/><col/><col align="left"/></colgroup><tbody><tr><td>A1</td><td>A2</td><td>A3</td><td rowspan="2">A4</td><td>A5</td><td>A6</td></tr><tr><td>B1</td><td>B2</td><td>B3</td><td>B5</td><td>B6</td></tr><tr><td>C1</td><td>C2</td><td>C3</td><td>C4</td><td rowspan="3" colspan="2" valign="middle">C5</td></tr><tr><td> </td><td colspan="0">D2</td><td>D3</td><td>D4</td></tr><tr><td>E1</td><td colspan="2" align="left">E2</td><td>E4</td></tr><tr><td>F1</td><td>F2</td><td>F3</td><td>F4</td><td>F5</td><td>F6</td></tr></tbody></table><p/></div><h3>With Footnotes</h3><div class="informaltable" id="id2883396"><p/><a name="id2883396"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>foo<sup>[<a name="fnrex1a" href="#ftn.fnrex1a"></a>]</sup></td><td>3<sup>[<a name="fnrex1b" href="#ftn.fnrex1b">a</a>]</sup></td></tr><tr><td>bar<sup>[<a href="#ftn.fnrex1a"></a>]</sup></td><td>5<sup>[<a href="#ftn.fnrex1b">a</a>]</sup></td></tr></tbody><tr><td colspan="2"><div class="footnote"><p><sup>[<a name="ftn.fnrex1a" href="#fnrex1a"></a>] </sup>A meaningless
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></dd></dl></div></div><div class="simplesect"><a name="id2892878"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2892878"/>SimpleLists</h2></div></div><h5>Inline</h5><p>An inline simple list:
+<span class="simplelist">One, Two, Three, Four, Five, Six, Seven</span></p><h5>Horiz</h5><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr><tr><td>Seven</td><td>&nbsp;</td><td>&nbsp;</td></tr></table><h5>Vert</h5><table class="simplelist" border="0" summary="Simple list"><tr><td>One</td><td>Four</td><td>Seven</td></tr><tr><td>Two</td><td>Five</td><td>&nbsp;</td></tr><tr><td>Three</td><td>Six</td><td>&nbsp;</td></tr></table></div><div class="simplesect"><a name="id2893152"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2893152"/>More Complex List Item Content</h2></div></div><div class="itemizedlist"><ul><li><p><a name="id2893173"/>One</p><p>Second para</p></li><li><p><a name="id2893197"/>Two</p><p>Second para</p></li><li><a name="id2893220"/><p>Three</p><p>Second para</p></li><li><p><a name="id2893244"/>Four</p><p>Second para</p></li><li><a name="id2893267"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2893307"/>Six</p></li></ul></div><div class="orderedlist"><ol type="1"><li><p><a name="id2893330"/>One</p><p>Second para</p></li><li><p><a name="id2893354"/>Two</p><p>Second para</p></li><li><a name="id2893377"/><p>Three</p><p>Second para</p></li><li><p><a name="id2893401"/>Four</p><p>Second para</p></li><li><a name="id2893424"/><p><b>Formal Element</b> Five</p><p>Second para</p></li><li><p><a name="id2893464"/>Six</p></li></ol></div></div><div class="simplesect"><a name="id2893483"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2893483"/>Segmented List</h2></div></div><p><b>State Birds</b></p><p><b>State: </b>Alabama</p><p><b>Bird: </b>Yellowhammer</p><p><b>State: </b>Alaska</p><p><b>Bird: </b>Willow Ptarmigan</p><p><b>State: </b>Arizona</p><p><b>Bird: </b>Cactus Wren</p><p><b>State: </b>Arkansas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>California</p><p><b>Bird: </b>California Valley Quail</p><p><b>State: </b>Colorado</p><p><b>Bird: </b>Lark Bunting</p><p><b>State: </b>Connecticut</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Delaware</p><p><b>Bird: </b>Blue Hen Chicken</p><p><b>State: </b>Florida</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Georgia</p><p><b>Bird: </b>Brown Thrasher</p><p><b>State: </b>Hawaii</p><p><b>Bird: </b>Nene</p><p><b>State: </b>Idaho</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>Illinois</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Indiana</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Iowa</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>Kansas</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Kentucky</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Louisiana</p><p><b>Bird: </b>Eastern Brown Pelican</p><p><b>State: </b>Maine</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Maryland</p><p><b>Bird: </b>Baltimore Oriole</p><p><b>State: </b>Massachusetts</p><p><b>Bird: </b>Chickadee</p><p><b>State: </b>Michigan</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Minnesota</p><p><b>Bird: </b>Common Loon</p><p><b>State: </b>Mississippi</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Missouri</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>Montana</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nebraska</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Nevada</p><p><b>Bird: </b>Mountain Bluebird</p><p><b>State: </b>New Hampshire</p><p><b>Bird: </b>Purple Finch</p><p><b>State: </b>New Jersey</p><p><b>Bird: </b>Eastern Goldfinch</p><p><b>State: </b>New Mexico</p><p><b>Bird: </b>Roadrunner</p><p><b>State: </b>New York</p><p><b>Bird: </b>Bluebird</p><p><b>State: </b>North Carolina</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>North Dakota</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Ohio</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Oklahoma</p><p><b>Bird: </b>Scissor-tailed Flycatcher</p><p><b>State: </b>Oregon</p><p><b>Bird: </b>Western Meadowlark</p><p><b>State: </b>Pennsylvania</p><p><b>Bird: </b>Ruffed Grouse</p><p><b>State: </b>Rhode Island</p><p><b>Bird: </b>Rhode Island Red</p><p><b>State: </b>South Carolina</p><p><b>Bird: </b>Great Carolina Wren</p><p><b>State: </b>South Dakota</p><p><b>Bird: </b>Ring-necked Pheasant</p><p><b>State: </b>Tennessee</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Texas</p><p><b>Bird: </b>Mockingbird</p><p><b>State: </b>Utah</p><p><b>Bird: </b>American Seagull</p><p><b>State: </b>Vermont</p><p><b>Bird: </b>Hermit Thrush</p><p><b>State: </b>Virginia</p><p><b>Bird: </b>Cardinal </p><p><b>State: </b>Washington</p><p><b>Bird: </b>Willow Goldfinch</p><p><b>State: </b>West Virginia</p><p><b>Bird: </b>Cardinal</p><p><b>State: </b>Wisconsin</p><p><b>Bird: </b>Robin</p><p><b>State: </b>Wyoming</p><p><b>Bird: </b>Western Meadowlark</p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2894677"/>Chapter 6. Table Tests</h2></div></div><h5>Alternate Alignment on Entry</h5><div class="informaltable" id="id2894711"><a name="id2894711"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table></div><div class="informaltable" id="id2894932"><a name="id2894932"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left">left</td><td align="center">center</td><td>center</td></tr><tr><td align="center">center</td><td align="right">right</td><td align="right">right</td></tr></tbody></table></div><div class="informaltable" id="id2895150"><a name="id2895150"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td align="left"><i>left emph</i></td><td align="center"><b>center emph/bold</b></td><td><tt>center literal</tt></td></tr><tr><td align="center"><tt>center filename</tt></td><td align="right"><b>right command</b></td><td align="right">right</td></tr></tbody></table></div><h5>Absolute Widths</h5><div class="informaltable" id="id2895400"><a name="id2895400"/><table border="1"><colgroup><col/><col/><col align="center"/></colgroup><thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead><tbody><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr><tr><td>e1</td><td>e2</td><td>e3</td></tr></tbody></table></div><h5>Relative Widths</h5><div class="informaltable" id="id2895639"><a name="id2895639"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td align="left"><p>left</p></td><td align="center"><p>center</p></td></tr><tr><td align="center"><p>center</p></td><td align="right"><p>right</p></td></tr></tbody></table></div><h5>Too many cells</h5><p>This is a broken table. There are too many cells in the second row.
+YMMV. Don't do this.</p><div class="informaltable" id="id2895807"><a name="id2895807"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td></tr></tbody></table></div><h5>Missing Entrys</h5><div class="table"><p><a name="t1"/><b>Table 6.0. Table Title</b></p><table summary="Table Title" width="100%" border="1"><colgroup><col/><col/><col/></colgroup><thead><tr><th><p>head1</p></th><th><p>head2</p></th><th><p>head3</p></th></tr></thead><tbody><tr><td><p>a1</p></td><td><p>a2</p></td><td><p>a3</p></td></tr><tr><td><p>b1</p></td><td><p>b3</p></td></tr><tr><td colspan="0"><p>c2</p></td><td><p>c3</p></td></tr></tbody></table></div><h5>Complex</h5><div class="informaltable" id="id2896193"><a name="id2896193"/><table width="100%" border="1"><colgroup><col/><col align="right"/><col align="center"/><col/><col/><col align="left"/></colgroup><tbody><tr><td>A1</td><td>A2</td><td>A3</td><td rowspan="2">A4</td><td>A5</td><td>A6</td></tr><tr><td>B1</td><td>B2</td><td>B3</td><td>B5</td><td>B6</td></tr><tr><td>C1</td><td>C2</td><td>C3</td><td>C4</td><td rowspan="3" colspan="2" valign="middle">C5</td></tr><tr><td colspan="0">D2</td><td>D3</td><td>D4</td></tr><tr><td>E1</td><td colspan="2" align="left">E2</td><td>E4</td></tr><tr><td>F1</td><td>F2</td><td>F3</td><td>F4</td><td>F5</td><td>F6</td></tr></tbody></table></div><h5>With Footnotes</h5><div class="informaltable" id="id2896636"><a name="id2896636"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>foo<sup>[<a name="fnrex1a" href="#ftn.fnrex1a"></a>]</sup></td><td>3<sup>[<a name="fnrex1b" href="#ftn.fnrex1b">a</a>]</sup></td></tr><tr><td>bar<sup>[<a href="#ftn.fnrex1a"></a>]</sup></td><td>5<sup>[<a href="#ftn.fnrex1b">a</a>]</sup></td></tr></tbody><tr><td colspan="2"><div class="footnote"><p><sup>[<a name="ftn.fnrex1a" href="#fnrex1a"></a>] </sup>A meaningless
word</p></div><div class="footnote"><p><sup>[<a name="ftn.fnrex1b" href="#fnrex1b">a</a>] </sup>A meaningless
-number</p></div></td></tr></table><p/></div><h3>A Big One</h3><div class="informaltable" id="id2883558"><p/><a name="id2883558"/><table border="1"><colgroup><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><thead><tr><th>H1</th><th>H2</th><th>H3</th><th>H4</th><th>H5</th><th>H6</th><th>H7</th><th>H8</th><th>H9</th><th>H10</th><th>H11</th><th>H12</th><th>H13</th><th>H14</th><th>H15</th></tr></thead><tbody><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr></tbody></table><p/></div></div><div id="id2887472" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2887472"/>Chapter 7. Index Term Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2887544">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2887846">Index Term Sect 2</a></dt><dt> <a href="#id2887989">Index Term Sect 3</a></dt></dl></dd></dl></div><p>Test data.</p><a class="indexterm" name="idx1"/><a class="indexterm" name="idx2"/><div class="sect1"><a name="id2887544"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2887544"/><span class="title">Index Term Sect 1</span></h2></div></div><p>Test data.</p><a class="indexterm" name="idx3"/><a class="indexterm" name="fred"/><a class="indexterm" name="idx5"/><a class="indexterm" name="idx6"/><a class="indexterm" name="idx7"/><a class="indexterm" name="idx8"/><a class="indexterm" name="idx9"/><a class="indexterm" name="id2887789"/><a class="indexterm" name="idx11"/><div class="sect2"><a name="id2887846"/><div class="titlepage"><div><h3 class="title"><a name="id2887846"/><span class="title">Index Term Sect 2</span></h3></div></div><p>Test data.</p><a class="indexterm" name="idx12"/><a class="indexterm" name="idx13"/><a class="indexterm" name="idx14"/><a class="indexterm" name="idx15"/></div><div class="sect2"><a name="id2887989"/><div class="titlepage"><div><h3 class="title"><a name="id2887989"/><span class="title">Index Term Sect 3</span></h3></div></div><p>foo</p></div></div></div></div><div class="part" id="part"><div class="titlepage"><div><h1 class="title"><a name="part"/>Part Two Title</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>8. <a href="#id2888041">CmdSynopsis Tests</a></dt><dt>9. <a href="#id2888798">FuncSynopsis Tests</a></dt><dt>10. <a href="#id2889097">Callout Tests</a></dt></dl></div><div id="id2888041" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2888041"/>Chapter 8. CmdSynopsis Tests</h2></div></div><h3>Very Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2888070"><a name="id2888070"/><tt>cd</tt> {<i><tt>directory</tt></i>}</div><h3>Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2888115"><a name="id2888115"/><tt>cal</tt> [-j] [-y] [month [year]]</div><h3>Another Simple CmdSynopsis</h3><div class="cmdsynopsis" id="id2888172"><a name="id2888172"/><tt>chgrp</tt> [-R
+number</p></div></td></tr></table></div><h5>A Big One</h5><div class="informaltable" id="id2896799"><a name="id2896799"/><table border="1"><colgroup><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><thead><tr><th>H1</th><th>H2</th><th>H3</th><th>H4</th><th>H5</th><th>H6</th><th>H7</th><th>H8</th><th>H9</th><th>H10</th><th>H11</th><th>H12</th><th>H13</th><th>H14</th><th>H15</th></tr></thead><tbody><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td><td>15</td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2900713"/>Chapter 7. Index Term Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2900784">Index Term Sect 1</a></dt><dd><dl><dt> <a href="#id2901086">Index Term Sect 2</a></dt><dt> <a href="#id2901230">Index Term Sect 3</a></dt></dl></dd></dl></div><p>Test data.</p><a class="indexterm" name="idx1"/><a class="indexterm" name="idx2"/><div class="sect1"><a name="id2900784"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2900784"/>Index Term Sect 1</h2></div></div><p>Test data.</p><a class="indexterm" name="idx3"/><a class="indexterm" name="fred"/><a class="indexterm" name="idx5"/><a class="indexterm" name="idx6"/><a class="indexterm" name="idx7"/><a class="indexterm" name="idx8"/><a class="indexterm" name="idx9"/><a class="indexterm" name="id2901030"/><a class="indexterm" name="idx11"/><div class="sect2"><a name="id2901086"/><div class="titlepage"><div><h3 class="title"><a name="id2901086"/>Index Term Sect 2</h3></div></div><p>Test data.</p><a class="indexterm" name="idx12"/><a class="indexterm" name="idx13"/><a class="indexterm" name="idx14"/><a class="indexterm" name="idx15"/></div><div class="sect2"><a name="id2901230"/><div class="titlepage"><div><h3 class="title"><a name="id2901230"/>Index Term Sect 3</h3></div></div><p>foo</p></div></div></div></div><div class="part" id="part"><div class="titlepage"><div><h1 class="title"><a name="part"/>Part Two Title</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>8 <a href="#id2901282">CmdSynopsis Tests</a></dt><dt>9 <a href="#id2902039">FuncSynopsis Tests</a></dt><dt>10 <a href="#id2902337">Callout Tests</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2901282"/>Chapter 8. CmdSynopsis Tests</h2></div></div><h5>Very Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2901311"><a name="id2901311"/><tt>cd</tt> {<i><tt>directory</tt></i>}</div><h5>Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2901356"><a name="id2901356"/><tt>cal</tt> [-j] [-y] [month [year]]</div><h5>Another Simple CmdSynopsis</h5><div class="cmdsynopsis" id="id2901413"><a name="id2901413"/><tt>chgrp</tt> [-R
[-H | -L | -P]
- ] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div><h3>Slightly Complex CmdSynopsis</h3><div class="cmdsynopsis" id="id2888284"><a name="id2888284"/><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div><h3>Quite Complex CmdSynopsis</h3><div class="cmdsynopsis" id="id2888415"><a name="id2888415"/><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br/> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br/> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br/> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div></div><div id="id2888798" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2888798"/>Chapter 9. FuncSynopsis Tests</h2></div></div><h3>Two Simple Parameters</h3><div class="funcsynopsis" id="id2888827"><p/><a name="id2888827"/><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br/>int <var class="pdparam">int1</var>;<br/>int <var class="pdparam">int2</var>;</code></p><p/></div><h3>Variable Arguments</h3><div class="funcsynopsis" id="id2888896"><p/><a name="id2888896"/><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p><p/></div><h3>Void</h3><div class="funcsynopsis" id="id2888963"><p/><a name="id2888963"/><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p><p/></div><h3>Function Pointer Arguments</h3><div class="funcsynopsis" id="id2889000"><p/><a name="id2889000"/><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br/>void *<var class="pdparam">dataptr</var>[];<br/>int <var class="pdparam">left</var>;<br/>int <var class="pdparam">right</var>;<br/>int <var class="pdparam">(* comp)</var>
- (void *, void *);</code></p><p/></div></div><div id="id2889097" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2889097"/>Chapter 10. Callout Tests</h2></div></div><h3>CallOut (using AREASPEC)</h3><div class="programlistingco"><pre class="programlisting">@rem = '--*-Perl-*--
+ ] [-f] <i><tt>group</tt></i> <i><tt>file</tt></i>... </div><h5>Slightly Complex CmdSynopsis</h5><div class="cmdsynopsis" id="id2901524"><a name="id2901524"/><tt>emacs</tt> [-t <i><tt>file</tt></i>] [-q] [-u <i><tt>user</tt></i>] [+<i><tt>number</tt></i>] [-f <i><tt>function</tt></i>...] [-l <i><tt>file</tt></i>...] <i><tt>file</tt></i>... </div><h5>Quite Complex CmdSynopsis</h5><div class="cmdsynopsis" id="id2901656"><a name="id2901656"/><tt>cccp</tt> [-$] [-C] [-D<i><tt>name</tt></i> [=<i><tt>definition</tt></i>]...] [-dD] [-dM] [-I <i><tt>directory</tt></i>...] [-H] [-I-]<br/> [-imacros <i><tt>file</tt></i>...] [-include <i><tt>file</tt></i>...] [-lang-c | -lang-c++ | -lang-objc] [-lint]<br/> [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-U<i><tt>name</tt></i>]<br/> [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {<i><tt>infile</tt></i> | -} {<i><tt>outfile</tt></i> | -}</div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2902039"/>Chapter 9. FuncSynopsis Tests</h2></div></div><h5>Two Simple Parameters</h5><div class="funcsynopsis" id="id2902067"><a name="id2902067"/><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(<var class="pdparam">int1</var>, <var class="pdparam">int2</var>);<br/>int <var class="pdparam">int1</var>;<br/>int <var class="pdparam">int2</var>;</code></p></div><h5>Variable Arguments</h5><div class="funcsynopsis" id="id2902137"><a name="id2902137"/><pre class="funcsynopsisinfo">#include &lt;varargs.h&gt;</pre><p><code><code class="funcdef">int <b class="fsfunc">max</b></code>(...);</code></p></div><h5>Void</h5><div class="funcsynopsis" id="id2902203"><a name="id2902203"/><p><code><code class="funcdef">int <b class="fsfunc">rand</b></code>();</code></p></div><h5>Function Pointer Arguments</h5><div class="funcsynopsis" id="id2902241"><a name="id2902241"/><p><code><code class="funcdef">void <b class="fsfunc">qsort</b></code>(<var class="pdparam">dataptr</var>, <var class="pdparam">left</var>, <var class="pdparam">right</var>, <var class="pdparam">(* comp)</var>);<br/>void *<var class="pdparam">dataptr</var>[];<br/>int <var class="pdparam">left</var>;<br/>int <var class="pdparam">right</var>;<br/>int <var class="pdparam">(* comp)</var>
+ (void *, void *);</code></p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2902337"/>Chapter 10. Callout Tests</h2></div></div><h5>CallOut (using AREASPEC)</h5><div class="programlistingco"><pre class="programlisting">@rem = '--*-Perl-*--
@echo off
perl.exe %_batchname %$
goto endofperl
@@ -269,38 +269,38 @@ while (@DIRS) {
}
}
-exit;</pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/1.png" alt="1" border="0"/></td><td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/2.png" alt="2" border="0"/></td><td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
-file interpreter, skips over the body of the Perl script.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/3.png" alt="3" border="0"/></td><td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
-fragments.</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/4.png" alt="4" border="0"/></td><td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
+exit;</pre><div class="calloutlist"><a name="id2902525"/><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="id2902534"/><img src="../images/callouts/1.png" alt="1" border="0"/></td><td valign="top" align="left"><p>The prologue handles embedding a Perl script in a DOS batch file.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902579"/><img src="../images/callouts/2.png" alt="2" border="0"/></td><td valign="top" align="left"><p>The <tt>goto</tt> statement, interpreted by the DOS batch
+file interpreter, skips over the body of the Perl script.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902621"/><img src="../images/callouts/3.png" alt="3" border="0"/></td><td valign="top" align="left"><p>The <tt>require</tt> statement sources in external program
+fragments.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902649"/><img src="../images/callouts/4.png" alt="4" border="0"/></td><td valign="top" align="left"><p>The <tt>use</tt> statement is similar, but has additional
utility. It is a Perl5 function. (Note that this callout area specifies
-both a line and a column.)</p></td></tr><tr><td width="5%" valign="top" align="left"><img src="../images/callouts/5.png" alt="5" border="0"/></td><td valign="top" align="left"><p>This is a user subroutine call.</p></td></tr></table></div></div><h3>CallOut (using CO)</h3><pre class="programlisting">this is a line
+both a line and a column.)</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902686"/><img src="../images/callouts/5.png" alt="5" border="0"/></td><td valign="top" align="left"><p>This is a user subroutine call.</p></td></tr></table></div></div><h5>CallOut (using CO)</h5><pre class="programlisting">this is a line
this is another line
there's a <a name="callout1"/><img src="../images/callouts/1.png" alt="1" border="0"/>callout in here.
and there's another on the
next line
-right here:<a name="callout2"/><img src="../images/callouts/2.png" alt="2" border="0"/></pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>First callout.</p><p>Second para in first callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+right here:<a name="callout2"/><img src="../images/callouts/2.png" alt="2" border="0"/></pre><div class="calloutlist"><a name="id2902752"/><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><a name="id2902772"/><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> </td><td valign="top" align="left"><p>First callout.</p><p>Second para in first callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902808"/><a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Second callout.</p><p>Third para in second callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td></tr></table></div></div></div><div class="part" id="id2889653"><div class="titlepage"><div><h1 class="title"><a name="id2889653"/>A Reference Part</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>I. <a href="#reference">Reference</a></dt></dl></div><div class="reference"><a name="reference"/><div class="titlepage"><div><h1 class="title"><a name="reference"/>Reference</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#id2889690">RefEntryTitle</a></dt><dt><a href="#id2889875"><tt>Chop</tt></a></dt></dl></div><div class="refentry"><h1 class="title"><a name="id2889690"/>RefEntryTitle</h1><div class="refnamediv"><a name="id2889713"/><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div><div class="refsynopsisdiv"><a name="id2889753"/><h2>Synopsis</h2><pre class="synopsis"> A
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Second callout.</p><p>Third para in second callout.</p></td></tr><tr><td width="5%" valign="top" align="left"><a name="id2902858"/><a href="#callout1"><img src="../images/callouts/1.png" alt="1" border="0"/></a> <a href="#callout2"><img src="../images/callouts/2.png" alt="2" border="0"/></a> </td><td valign="top" align="left"><p>This paragraph describes <i>both</i> callouts.</p></td></tr></table></div></div></div><div class="part" id="id2902894"><div class="titlepage"><div><h1 class="title"><a name="id2902894"/>A Reference Part</h1></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>I <a href="#reference">Reference</a></dt><dd><dl><dt><a href="#id2902931">RefEntryTitle</a></dt><dt><a href="#id2903116"><tt>Chop</tt></a></dt></dl></dd></dl></div><div class="reference"><a name="reference"/><div class="titlepage"><div><h1 class="title"><a name="reference"/>Reference</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="#id2902931">RefEntryTitle</a></dt><dt><a href="#id2903116"><tt>Chop</tt></a></dt></dl></div><div class="refentry"><h1 class="title"><a name="id2902931"/>RefEntryTitle</h1><div class="refnamediv"><a name="id2902953"/><h2>Name</h2>RefName1, RefName2 &#x2014; Yes, there must be a purpose!</div><div class="refsynopsisdiv"><a name="id2902994"/><h2>Synopsis</h2><pre class="synopsis"> A
Synopsis
Goes
- Here</pre></div><div class="refsect1"><a name="id2889769"/><h2><a name="id2889769"/>A RefSect1</h2><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+ Here</pre></div><div class="refsect1"><a name="id2903010"/><h2><a name="id2903010"/>A RefSect1</h2><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect2"><a name="id2889797"/><h3><a name="id2889797"/>A RefSect2</h3><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect2"><a name="id2903038"/><h3><a name="id2903038"/>A RefSect2</h3><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect3"><a name="id2889825"/><h4><a name="id2889825"/>A RefSect3</h4><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="refsect3"><a name="id2903066"/><h4><a name="id2903066"/>A RefSect3</h4><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah.<sup>[<a name="id2889848" href="#ftn.id2889848">6</a>]</sup>
+Blah blah blah blah.<sup>[<a name="id2903088" href="#ftn.id2903088">6</a>]</sup>
Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></div></div></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2889848" href="#id2889848">6</a>] </sup>This is a footnote in a refentry.</p></div></div></div><div class="refentry"><h1 class="title"><a name="id2889875"/><tt>Chop</tt></h1><div class="refnamediv"><a name="id2889881"/><h2>Name</h2><tt>Chop</tt> &#x2014; strip trailing whitespace</div><div class="refsect1"><a name="id2889908"/><h2><a name="id2889908"/>Description</h2><p> Returns the argument string without trailing whitespace.
- <div class="example"><p><a name="id2889929"/><b>Example 2. chop() example</b></p><pre class="programlisting">$trimmed = Chop($line);</pre></div>
- </p></div></div></div></div><div id="appendix" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. A Very Short Appendix</h2></div></div><p>Blah.</p></div><div id="id2889995" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2889995"/>Appendix B. A Very Long Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2890645">a sect1 title</a></dt><dd><dl><dt> <a href="#id2890685">a sect2 title</a></dt></dl></dd><dt> <a href="#id2890816">another sect1 title</a></dt><dd><dl><dt> <a href="#id2890870">another sect2 title</a></dt></dl></dd><dt> <a href="#id2891105">another sect1 title</a></dt><dt> <a href="#id2891138">another sect1 title</a></dt></dl></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p></div></div></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2903088" href="#id2903088">6</a>] </sup>This is a footnote in a refentry.</p></div></div></div><div class="refentry"><h1 class="title"><a name="id2903116"/><tt>Chop</tt></h1><div class="refnamediv"><a name="id2903122"/><h2>Name</h2><tt>Chop</tt> &#x2014; strip trailing whitespace</div><div class="refsect1"><a name="id2903149"/><h2><a name="id2903149"/>Description</h2><p> Returns the argument string without trailing whitespace.
+ <div class="example"><p><a name="id2903170"/><b>Example 2. chop() example</b></p><pre class="programlisting">$trimmed = Chop($line);</pre></div>
+ </p></div></div></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="appendix"/>Appendix A. A Very Short Appendix</h2></div></div><p>Blah.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2903236"/>Appendix B. A Very Long Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2903886">a sect1 title</a></dt><dd><dl><dt> <a href="#id2903926">a sect2 title</a></dt></dl></dd><dt> <a href="#id2904056">another sect1 title</a></dt><dd><dl><dt> <a href="#id2904111">another sect2 title</a></dt></dl></dd><dt> <a href="#id2904346">another sect1 title</a></dt><dt> <a href="#id2904378">another sect1 title</a></dt></dl></div><p>Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
@@ -484,75 +484,75 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><p>Blah blah b
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
-Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="sect1"><a name="id2890645"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2890645"/><span class="title">a sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.</p><div class="sect1"><a name="id2903886"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2903886"/>a sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2890685"/><div class="titlepage"><div><h3 class="title"><a name="id2890685"/><span class="title">a sect2 title</span></h3></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2903926"/><div class="titlepage"><div><h3 class="title"><a name="id2903926"/>a sect2 title</h3></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2890715"/><div class="titlepage"><div><h4 class="title"><a name="id2890715"/><span class="title">a sect3 title</span></h4></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2903956"/><div class="titlepage"><div><h4 class="title"><a name="id2903956"/>a sect3 title</h4></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2890746"/><div class="titlepage"><div><h5 class="title"><a name="id2890746"/><span class="title">a sect4 title</span></h5></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2903987"/><div class="titlepage"><div><h5 class="title"><a name="id2903987"/>a sect4 title</h5></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2890777"/><div class="titlepage"><div><h6 class="title"><a name="id2890777"/><span class="title">a sect5 title</span></h6></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2904017"/><div class="titlepage"><div><h6 class="title"><a name="id2904017"/>a sect5 title</h6></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2890816"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2890816"/><span class="title">another sect1 title</span></h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2904056"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2904063"/>another sect1 title</h2></div><div><h2 class="subtitle">a sect1 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2890870"/><div class="titlepage"><div><h3 class="title"><a name="id2890870"/><span class="title">another sect2 title</span></h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect2"><a name="id2904111"/><div class="titlepage"><div><h3 class="title"><a name="id2904117"/>another sect2 title</h3></div><div><h2 class="subtitle">a sect2 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2890925"/><div class="titlepage"><div><h4 class="title"><a name="id2890925"/><span class="title">another sect3 title</span></h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect3"><a name="id2904165"/><div class="titlepage"><div><h4 class="title"><a name="id2904172"/>another sect3 title</h4></div><div><h2 class="subtitle">a sect3 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2890988"/><div class="titlepage"><div><h5 class="title"><a name="id2890988"/><span class="title">another sect4 title</span></h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect4"><a name="id2904229"/><div class="titlepage"><div><h5 class="title"><a name="id2904235"/>another sect4 title</h5></div><div><h2 class="subtitle">a sect4 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2891042"/><div class="titlepage"><div><h6 class="title"><a name="id2891042"/><span class="title">another sect5 title</span></h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p><div class="sect5"><a name="id2904283"/><div class="titlepage"><div><h6 class="title"><a name="id2904289"/>another sect5 title</h6></div><div><h2 class="subtitle">a sect5 subtitle</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2891105"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2891105"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div></div></div></div><div class="sect1"><a name="id2904346"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2904346"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="id2891138"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2891138"/><span class="title">another sect1 title</span></h2></div></div><p>some text. some text. some text. some text. some text. some text.
+some text. some text. some text. some text. some text. some text. some text. </p></div><div class="sect1"><a name="id2904378"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2904378"/>another sect1 title</h2></div></div><p>some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
some text. some text. some text. some text. some text. some text. some text.
-some text. some text. some text. some text. some text. some text. some text. </p></div></div><div class="bibliography"><h2 class="title"><a name="bib1">A Test Bibliography</a></h2><p>The stock stylesheet attempts to do a Bibliography. It probably needs
-a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2891205">Books</a></h3><div id="id2891219" class="biblioentry"><a name="id2891219"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2891452">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
+some text. some text. some text. some text. some text. some text. some text. </p></div></div><div id="bib1" class="bibliography"><div class="titlepage"><div><h2 class="title"><a name="bib1"/>A Test Bibliography</h2></div></div><p>The stock stylesheet attempts to do a Bibliography. It probably needs
+a lot of tweaking. It probably doesn't conform to any specific style.</p><div class="bibliodiv"><h3 class="title"><a name="id2904446">Books</a></h3><div id="id2904460" class="biblioentry"><a name="id2904460"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div><div class="bibliodiv"><h3 class="title"><a name="id2904693">Periodicals</a></h3><div id="walsh97" class="biblioentry"><a name="walsh97"/><p><span class="abbrev">[Walsh97] </span><span class="biblioset">&#x201C;A Guide to XML&#x201D;. <span class="author">Norman Walsh. </span><span class="pubdate">1997. </span><span class="copyright">Copyright © 1997 ArborText, Inc.. </span><span class="pagenums">97-108. </span></span><span class="biblioset"><I>XML: Principles, Tools, and Techniques</I>. <span class="publisher"><span class="publishername">O'Reilly &amp; Associates, Inc.. </span></span><span class="issn">1085-2301. </span><span class="editor">Dan Connolly. </span></span></p></div><div id="walsh96" class="bibliomixed"><a name="walsh96"/><p> <span class="bibliomset"> <span class="surname">Walsh</span>, <span class="firstname">Norman</span>.
&#x201C;Introduction to Cascading Style Sheets&#x201D;.
</span>
<span class="bibliomset"> <I>The World Wide Web Journal</I>.
<span class="volumenum">2</span>(<span class="issuenum">1</span>).
<span class="publishername">O'Reilly &amp; Associates, Inc.</span> and
<span class="corpname">The World Wide Web Consortium</span>.
- <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2891762" class="biblioentry"><a name="id2891762"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
+ <span class="pubdate">Winter, 1996</span></span>.</p></div><div id="id2905003" class="biblioentry"><a name="id2905003"/><p><span class="abbrev">[Abbrev] </span><span class="title"><I>A Really Full BiblioEntry</I>. </span><span class="subtitle">Subtitle. </span><span class="address">Any Street
Anywhere, XX 99999
USA. </span><span class="affiliation"><span class="shortaffil">shortaffil. </span><span class="jobtitle">jobtitle. </span><span class="orgname">orgname. </span><span class="orgdiv">orgdiv. </span><span class="address">Any Street
Anywhere, XX 99999
@@ -562,10 +562,10 @@ USA. </span>. </span>. </span><span class="confgroup"><span class="confdates">co
Anywhere, XX 99999
USA. </span><span class="confsponsor">confsponsor. </span>. </span><span class="contractnum">ContractNum. </span><span class="contractsponsor">ContractSponsor. </span><span class="contrib">Contrib. </span><span class="copyright">Copyright © 1998 Copyright holder. </span><span class="corpname">CorpName. </span><span class="date">Date. </span><span class="edition">Edition. </span><span class="editor">EditorFirstName EditorSurname. </span><span class="firstname">FirstName. </span><span class="honorific">Honorific. </span><span class="isbn">ISBN. </span><span class="issn">ISSN. </span><span class="invpartnumber">InvPartNumber. </span><span class="issuenum">IssueNum. </span><span class="lineage">Lineage. </span><span class="orgname">OrgName. </span><span class="othercredit"><span class="firstname">OCFirstName. </span><span class="surname">OCSurname. </span>. </span><span class="othername">OtherName. </span><span class="pagenums">PageNums. </span><span class="productname">ProductName. </span><span class="productnumber">ProductNumber. </span><span class="pubdate">PubDate. </span><span class="publisher"><span class="publishername">PubPublisherName. </span><span class="address">Any Street
Anywhere, XX 99999
-USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesinfo"><span class="title"><I>SeriesInfo Title</I>. </span><span class="editor">SeriesInfo Editor Firstname SeriesInfo Editor Surname. </span></span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div class="glossary"><h2>Example Glossary</h2><dl><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
- Markup Language</a>.</p></dd></div><div class="glossdiv"><h3 class="title">S</h3><dt><a name="id2892703">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
+USA. </span></span><span class="publishername">PublisherName. </span><span class="pubsnumber">PubsNumber. </span><span class="releaseinfo">ReleaseInfo. </span><span class="revhistory"><tr><td align="left">Revision 1.0</td><td align="left">20 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.9</td><td align="left">19 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr><tr><td align="left">Revision 0.4</td><td align="left">18 Nov 1998</td><td align="left">ndw</td></tr><tr><td align="left" colspan="3">Some remark about the revision</td></tr>. </span><span class="seriesinfo"><span class="title"><I>SeriesInfo Title</I>. </span><span class="editor">SeriesInfo Editor Firstname SeriesInfo Editor Surname. </span></span><span class="seriesvolnums">SeriesVolNums. </span><span class="surname">Surname. </span><span class="titleabbrev">TitleAbbrev. </span><span class="volumenum">VolumeNum. </span></p></div></div></div><div id="gloss" class="glossary"><div class="titlepage"><div><h2 class="title"><a name="gloss"/>Example Glossary</h2></div></div><p>This is not a real glossary, it's just an example.</p><div class="glossdiv"><h3 class="title">E</h3><dl><dt><a name="xml">Extensible Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#sgml">Standard Generalized
+ Markup Language</a>.</p></dd></dl></div><div class="glossdiv"><h3 class="title">S</h3><dl><dt><a name="id2905944">SGML</a></dt><dd><p>See <a href="#sgml">Standard Generalized
Markup Language</a>.</p></dd><dt><a name="sgml">Standard Generalized
- Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></div></dl></div><div class="index"><h2 class="title"><a name="index">Index</a></h2><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div class="index"><h2 class="title"><a name="id2893187">An Index with a Title</a></h2><div class="indexdiv">Symbols<dl><dt>!,
+ Markup Language</a></dt><dd><p>Some reasonable definition here.</p><p>See Also <a href="#xml">Extensible Markup Language</a>.</p></dd></dl></div></div><div id="index" class="index"><div class="titlepage"><div><h2 class="title"><a name="index"/>Index</h2></div></div><p>This is a test index.</p><p><b>a formal para</b> this is a formal paragraph.</p><dt>Primary</dt><dd><dl><dt>Secondary 1</dt><dd><dl><dt>Tertiary 11</dt><dt>Tertiary 12</dt><dt>Tertiary 21</dt></dl></dd><dt>Secondary 2</dt><dd><dl><dt>Tertiary 21</dt></dl></dd></dl></dd><dt>primary</dt><dt>primary</dt><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary1</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary</dt><dd><dl><dt>tertiary2</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt></dl></dd></dl></dd><dt>primary</dt><dd><dl><dt>see ie</dt></dl></dd><dt>primary</dt><dd><dl><dt>secondary2</dt><dd><dl><dt>tertiary3</dt><dd><dl><dt>seealso ie</dt></dl></dd></dl></dd></dl></dd></div><div id="id2906428" class="index"><div class="titlepage"><div><h2 class="title"><a name="id2906428"/>An Index with a Title</h2></div></div><div class="indexdiv">Symbols<dl><dt>!,
<a href="c3.htm#aen10" target="_top">Index Term Sect 1</a>
</dt><dt>[,
<a href="c3.htm#aen38" target="_top">Index Term Sect 2</a>
diff --git a/tests/docbook/result/xhtml/docbook40.xhtml b/tests/docbook/result/xhtml/docbook40.xhtml
index d9ccc7bd..d1d1c742 100644
--- a/tests/docbook/result/xhtml/docbook40.xhtml
+++ b/tests/docbook/result/xhtml/docbook40.xhtml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>DocBook V4.0 Example Document</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751437"><div class="titlepage"><div><h1 class="title"><a name="id2751437"/>DocBook V4.0 Example Document</h1></div><div><h3 class="author">Norman Walsh</h3></div><div><div class="abstract"><p><a name="id2848556"/><b>Abstract</b></p><p>This document demonstrates the new tags in DocBook V4.0.</p><p>The focus of this document is to present examples of new elements,
+<html><head><title>DocBook V4.0 Example Document</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599781"><div class="titlepage"><div><h1 class="title"><a name="id2599781"/>DocBook V4.0 Example Document</h1></div><div><h3 class="author">Norman Walsh</h3></div><div><div class="abstract"><p><a name="id2861799"/><b>Abstract</b></p><p>This document demonstrates the new tags in DocBook V4.0.</p><p>The focus of this document is to present examples of new elements,
minor changes such as the addition of new attribute values are not
-included.</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#id2848581">Block-level Markup</a></dt><dt>2. <a href="#id2755964">Inline markup</a></dt></dl></div><div id="id2848581" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2848581"/>Chapter 1. Block-level Markup</h2></div></div><p>There's a new simple-alternative for <tt>msgentry</tt>:
-<tt>simplemsgentry</tt>.</p><div class="simplemsgentry"><a name="id2750804"/><p>The text of a message</p><div class="msgexplan"><a name="id2848640"/><p>An explanation of the message.</p></div></div><div class="simplemsgentry"><a name="id2874774"/><p>The text of a message</p><div class="msgexplan"><a name="id2874790"/><p>An explanation of the message.</p></div></div><p>Longer descriptions are possible in a <tt>revhistory</tt>:
+included.</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#id2861826">Block-level Markup</a></dt><dt>2 <a href="#id2769750">Inline markup</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2861826"/>Chapter 1. Block-level Markup</h2></div></div><p>There's a new simple-alternative for <tt>msgentry</tt>:
+<tt>simplemsgentry</tt>.</p><div class="simplemsgentry"><a name="id2599742"/><p>The text of a message</p><div class="msgexplan"><a name="id2763318"/><p>An explanation of the message.</p></div></div><div class="simplemsgentry"><a name="id2861885"/><p>The text of a message</p><div class="msgexplan"><a name="id2888023"/><p>An explanation of the message.</p></div></div><p>Longer descriptions are possible in a <tt>revhistory</tt>:
</p><p>
<div class="revhistory"><table border="0" width="100%" summary="Revision history"><tr><th align="left" valign="top" colspan="3"><b>Revision History</b></th></tr><tr><td align="left">Revision 2</td><td align="left">today</td><td align="left">nwalsh</td></tr><tr><td align="left">Revision 1</td><td align="left">yesterday</td><td align="left">nwalsh</td></tr></table></div>
-</p><p>Ordered and itemized lists can have titles:</p><div class="itemizedlist"><p><b>Itemized List</b></p><ul><li><p><a name="id2757437"/>First thing</p></li><li><p><a name="id2757448"/>Second thing</p></li><li><p><a name="id2757458"/>Third thing</p></li></ul></div><div class="itemizedlist"><p><b>Ordered List</b></p><ul><li><p><a name="id2757482"/>First thing</p></li><li><p><a name="id2757492"/>Second thing</p></li><li><p><a name="id2757503"/>Third thing</p></li></ul></div><p>Linespecific environments can indicate line numbering:</p><pre class="programlisting">
+</p><p>Ordered and itemized lists can have titles:</p><div class="itemizedlist"><p><b>Itemized List</b></p><ul><li><p><a name="id2771339"/>First thing</p></li><li><p><a name="id2771349"/>Second thing</p></li><li><p><a name="id2771360"/>Third thing</p></li></ul></div><div class="itemizedlist"><p><b>Ordered List</b></p><ul><li><p><a name="id2771384"/>First thing</p></li><li><p><a name="id2771394"/>Second thing</p></li><li><p><a name="id2771405"/>Third thing</p></li></ul></div><p>Linespecific environments can indicate line numbering:</p><pre class="programlisting">
&lt;!ENTITY % linespecific.attrib
&quot;format NOTATION
(linespecific) 'linespecific'
@@ -15,8 +15,8 @@ object-oriented programming language classes. Here's one example:</p><pre class=
<div class="fieldsynopsis">  <span class="modifier">private </span><span class="type">Writer </span><span class="varname">writer </span>;</div><div class="fieldsynopsis">  <span class="modifier">public </span><span class="type">String </span><span class="varname">writerName </span><span class="initializer">= &quot;MyWriter&quot;</span>;</div><div class="methodsynopsis"> <span class="modifier">static </span><span class="modifier">public </span><span class="void">void </span><span class="methodname">write</span>(<span class="methodparam"><span class="type">ResultTreeFragment </span><span class="parameter">frag</span></span>,
                           <span class="methodparam"><span class="type">String </span><span class="parameter">file</span></span>)
-    throws <span class="exceptionname">SAXException</span>;</div>}</pre></div><div id="id2755964" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2755964"/>Chapter 2. Inline markup</h2></div></div><p>The <tt>sgmltag</tt> element has new
-class attribute values:
+    throws <span class="exceptionname">SAXException</span>;</div>}</pre></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2769750"/>Chapter 2. Inline markup</h2></div></div><p>The <tt>sgmltag</tt> element has new
+<tt>class</tt> attribute values:
<tt>xmlpi</tt> and
<tt>emptytag</tt>. These produce
<tt>&lt;?processing instructions?&gt;</tt>
diff --git a/tests/docbook/result/xhtml/external.xhtml b/tests/docbook/result/xhtml/external.xhtml
index 31272a34..d4257737 100644
--- a/tests/docbook/result/xhtml/external.xhtml
+++ b/tests/docbook/result/xhtml/external.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Main document</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751437"><div class="titlepage"><div><h1 class="title"><a name="id2751437"/>Main document</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#main">Chapter</a></dt><dt>2. <a href="#subdoc">Chapter</a></dt></dl></div><div id="main" class="chapter"><div class="titlepage"/><p>This references to: <a href="#subdoc"/></p></div><div id="subdoc" class="chapter"><div class="titlepage"/><p>This is nothing, but a subdoc</p></div></div></body></html>
+<html><head><title>Main document</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2600645"><div class="titlepage"><div><h1 class="title"><a name="id2600645"/>Main document</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#main"/></dt><dt>2 <a href="#subdoc"/></dt></dl></div><div class="chapter"><div class="titlepage"/><p>This references to: <a href="#subdoc" title="Chapter 1. "/></p></div><div class="chapter"><div class="titlepage"/><p>This is nothing, but a subdoc</p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/figtest.xhtml b/tests/docbook/result/xhtml/figtest.xhtml
index d7aa513e..8a9a6fb6 100644
--- a/tests/docbook/result/xhtml/figtest.xhtml
+++ b/tests/docbook/result/xhtml/figtest.xhtml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751127" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2751127"/>Article Test Document Title</h1></div><hr/></div><p>
+<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2779384"/>Article Test Document Title</h2></div><hr/></div><p>
This is a &#x201C;short quote&#x201D;.
-This is a &#x201C;Quotation with a `nested quotation
-containing a &#x201C;nested quotation and another `nested
-quotation'&#x201D;'&#x201D;.
+This is a &#x201C;Quotation with a &#x2018;nested quotation
+containing a &#x201C;nested quotation and another &#x2018;nested
+quotation&#x2019;&#x201D;&#x2019;&#x201D;.
</p><div class="figure"><p><a name="testfig1"/><b>Figure 1. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div><p>This para contains an xref to a figure: <a href="#testfig1">Figure 1.</a>.
+</pre></div><p>This para contains an xref to a figure: <a href="#testfig1" title="Figure 1. Test Figure">Figure 1. Test Figure</a>.
</p><div class="figure"><p><a name="testfig2"/><b>Figure 2. Test Figure2</b></p><pre class="programlisting">A Second
Test Figure
-</pre></div><p>This para contains an <a href="#testfig2">link</a> to a
-figure. And an xref: <a href="#testfig2">Figure 2.</a>.
+</pre></div><p>This para contains an <a href="#testfig2" title="Figure 2. Test Figure2">link</a> to a
+figure. And an xref: <a href="#testfig2" title="Figure 2. Test Figure2">Figure 2. Test Figure2</a>.
</p><div class="figure"><p><a name="testfig3"/><b>Figure 3. Test Figure</b></p><pre class="programlisting">This is a
ProgramListing
-</pre></div><p>This para contains an xref to a figure: <a href="#testfig3">Figure 3.</a>.
+</pre></div><p>This para contains an xref to a figure: <a href="#testfig3" title="Figure 3. Test Figure">Figure 3. Test Figure</a>.
</p></div></body></html>
diff --git a/tests/docbook/result/xhtml/foottest.xhtml b/tests/docbook/result/xhtml/foottest.xhtml
index 4bdbb57a..3924f9ca 100644
--- a/tests/docbook/result/xhtml/foottest.xhtml
+++ b/tests/docbook/result/xhtml/foottest.xhtml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751127" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2751127"/>Article Test Document Title</h1></div><div><h3 class="corpauthor">nwalsh</h3><h3 class="author">Norman Walsh</h3><h3 class="othercredit">Other Credit</h3><h4 class="editedby">Edited by</h4><h3 class="editor">Someother Editor</h3><h3 class="author">Someone Else</h3></div><div><p class="copyright">Copyright © 1999 by Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2753702"/><b>Abstract</b></p><p>This article is just a test. This article is just a test.
+<html><head><title>Article Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2779384"/>Article Test Document Title</h2></div><div><h3 class="corpauthor">nwalsh</h3><h3 class="author">Norman Walsh</h3><h3 class="othercredit">Other Credit</h3><h4 class="editedby">Edited by</h4><h3 class="editor">Someother Editor</h3><h3 class="author">Someone Else</h3></div><div><p class="copyright">Copyright © 1999 Norman Walsh</p></div><div><p class="pubdate">Apr. 26, 1999</p></div><div><div class="abstract"><p><a name="id2766979"/><b>Abstract</b></p><p>This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
This article is just a test. This article is just a test.
-</p></div></div><hr/></div><p>This is a footnote<sup>[<a name="id2753731" href="#ftn.id2753731">1</a>]</sup>.</p><div class="informaltable" id="id2753743"><p/><a name="id2753743"/><table border="1"><colgroup><col/><col/><col/></colgroup><tbody><tr><td>entry</td><td>entry</td><td>entry</td></tr><tr><td>entry<sup>[<a name="id2753805" href="#ftn.id2753805">b</a>]</sup></td><td>entry</td><td>entry</td></tr><tr><td>entry</td><td>entry</td><td>entry</td></tr><tr><td>Nebbiolo, Bonarda<sup>[<a name="ch15tb1" href="#ftn.ch15tb1">c</a>]</sup></td><td> </td><td> </td></tr><tr><td>Sangiovese, Canaiolo, and others<sup>[<a href="#ftn.ch15tb1">c</a>]</sup></td><td> </td><td> </td></tr></tbody><tr><td colspan="3"><div class="footnote"><p><sup>[<a name="ftn.id2753805" href="#id2753805">b</a>] </sup>table cell footnote</p></div><div class="footnote"><p><sup>[<a name="ftn.ch15tb1" href="#ch15tb1">c</a>] </sup>
+</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>A <a href="#id2765877">Appendix</a></dt></dl></div><p>This is a footnote<sup>[<a name="id2767008" href="#ftn.id2767008">1</a>]</sup>.</p><div class="informaltable" id="id2767021"><a name="id2767021"/><table border="1"><colgroup><col/><col/><col/></colgroup><tbody><tr><td>entry</td><td>entry</td><td>entry</td></tr><tr><td>entry<sup>[<a name="id2767083" href="#ftn.id2767083">b</a>]</sup></td><td>entry</td><td>entry</td></tr><tr><td>entry</td><td>entry</td><td>entry</td></tr><tr><td>Nebbiolo, Bonarda<sup>[<a name="ch15tb1" href="#ftn.ch15tb1">c</a>]</sup></td><td> </td><td> </td></tr><tr><td>Sangiovese, Canaiolo, and others<sup>[<a href="#ftn.ch15tb1">c</a>]</sup></td><td> </td><td> </td></tr></tbody><tr><td colspan="3"><div class="footnote"><p><sup>[<a name="ftn.id2767083" href="#id2767083">b</a>] </sup>table cell footnote</p></div><div class="footnote"><p><sup>[<a name="ftn.ch15tb1" href="#ch15tb1">c</a>] </sup>
<i>Blended wines, made from two or more grapes</i>
-</p></div></td></tr></table><p/></div><div id="id2752598" class="appendix"><h2 class="title" style="clear: all"><a name="id2752598"/>Appendix A. Appendix</h2><p>This is just a test.</p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2753731" href="#id2753731">1</a>] </sup>See?</p></div></div></div></body></html>
+</p></div></td></tr></table></div><div class="appendix"><h2 class="title" style="clear: both"><a name="id2765877"/>A. Appendix</h2><p>This is just a test.</p></div><div class="footnotes"><br/><hr width="100" align="left"/><div class="footnote"><p><sup>[<a name="ftn.id2767008" href="#id2767008">1</a>] </sup>See?</p></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/fotest.xhtml b/tests/docbook/result/xhtml/fotest.xhtml
index 2708a469..e6e0d160 100644
--- a/tests/docbook/result/xhtml/fotest.xhtml
+++ b/tests/docbook/result/xhtml/fotest.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2757212"><div class="titlepage"><div><h1 class="title"><a name="id2757212"/>Book Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2757267">Foreword</a></dt><dt>1. <a href="#id2799242">First Chapter</a></dt><dt>A. <a href="#id2755458">First Appendix</a></dt></dl></div><div id="id2757267" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2757267"/>Foreword</h2></div></div><p>This is a test paragraph.</p><div class="table"><p><a name="table"/><b>Table 1. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div id="id2799242" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2799242"/>Chapter 1. First Chapter</h2></div><div><h2 class="subtitle">Chapter Subtitle</h2></div></div><p>This is a test paragraph.</p></div><div id="id2755458" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2755458"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p></div></div></body></html>
+<html><head><title>Book Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770467"><div class="titlepage"><div><h1 class="title"><a name="id2770467"/>Bookinfo Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2770521">Foreword</a></dt><dt>1 <a href="#id2812500">First Chapter</a></dt><dt>A <a href="#id2768710">First Appendix</a></dt></dl></div><div id="id2770521" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2770521"/>Foreword</h2></div></div><p>This is a test paragraph.</p><div class="table"><p><a name="table"/><b>Table 1. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col/></colgroup><tbody><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>4</td></tr><tr><td>3</td><td>9</td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2812500"/>Chapter 1. First Chapter</h2></div><div><h3 class="subtitle"><i>Chapter Subtitle</i></h3></div></div><p>This is a test paragraph.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2768710"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/func.xhtml b/tests/docbook/result/xhtml/func.xhtml
index df1c07a6..c9f1ef9a 100644
--- a/tests/docbook/result/xhtml/func.xhtml
+++ b/tests/docbook/result/xhtml/func.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Chapter 1. test</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="ch1" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>
+<html><head><title>Chapter 1. test</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>
This is a <tt>foo<i><tt>x</tt></i>, <i><tt>y</tt></i></tt>. This is just a <i><tt>x</tt></i>.
</p><p>
This is a <tt>bar<i><tt>x</tt></i>, <tt>y<i><tt>z</tt></i></tt></tt>. This is just a <i><tt>x</tt></i>.
diff --git a/tests/docbook/result/xhtml/gdp-handbook.xhtml b/tests/docbook/result/xhtml/gdp-handbook.xhtml
index 052494c2..c6993d4f 100644
--- a/tests/docbook/result/xhtml/gdp-handbook.xhtml
+++ b/tests/docbook/result/xhtml/gdp-handbook.xhtml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>The GNOME Handbook of Writing Software Documentation</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="index" class="article"><div class="titlepage"><div><h1 class="title"><a name="index"/>The GNOME Handbook of Writing Software Documentation</h1></div><div><h3 class="author">David Mason</h3><div class="affiliation"><span class="orgname">Red Hat, Inc.<br/></span><pre class="address">
- <tt>&lt;<a href="mailto:dcm@redhat.com">dcm@redhat.com</a>&gt;</tt>
- </pre></div><h3 class="author">Daniel Mueth</h3><div class="affiliation"><pre class="address">
- <tt>&lt;<a href="mailto:d-mueth@uchicago.edu">d-mueth@uchicago.edu</a>&gt;</tt>
- </pre></div><h3 class="author">Alexander Kirillov</h3><div class="affiliation"><pre class="address">
- <tt>&lt;<a href="mailto:kirillov@math.sunysb.edu">kirillov@math.sunysb.edu</a>&gt;</tt>
- </pre></div></div><div><span class="releaseinfo">
+<html><head><title>The GNOME Handbook of Writing Software Documentation</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="index"/>The GNOME Handbook of Writing Software Documentation</h2></div><div><h3 class="author">David Mason</h3><div class="affiliation"><span class="orgname">Red Hat, Inc.<br/></span><div class="address"><br/>
+            <tt>&lt;<a href="mailto:dcm@redhat.com">dcm@redhat.com</a>&gt;</tt><br/>
+          </div></div><h3 class="author">Daniel Mueth</h3><div class="affiliation"><div class="address"><br/>
+            <tt>&lt;<a href="mailto:d-mueth@uchicago.edu">d-mueth@uchicago.edu</a>&gt;</tt><br/>
+          </div></div><h3 class="author">Alexander Kirillov</h3><div class="affiliation"><div class="address"><br/>
+            <tt>&lt;<a href="mailto:kirillov@math.sunysb.edu">kirillov@math.sunysb.edu</a>&gt;</tt><br/>
+          </div></div></div><div><p class="releaseinfo">
This is a pre-release!
- <br/></span></div><div><p class="copyright">Copyright © 2000 by Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</p></div><div><div class="legalnotice"><p>
+ </p></div><div><p class="copyright">Copyright © 2000 Red Hat, Inc., Daniel Mueth, and Alexander Kirillov</p></div><div><div class="legalnotice"><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <i>GNU Free Documentation
License</i>, Version 1.1 or any later version published
@@ -28,7 +28,7 @@
</td><td align="left">
04.10.2000
</td></tr></table></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#intro">Introduction</a></dt><dd><dl><dt> <a href="#gdp">The GNOME Documentation Project</a></dt><dt> <a href="#notation">Notation and Conventions</a></dt><dt> <a href="#about">About This Handbook</a></dt></dl></dd><dt> <a href="#gettingstarted">Getting Started Writing GNOME Documentation</a></dt><dd><dl><dt> <a href="#selecting">Selecting A Document</a></dt><dt> <a href="#docbook">Installing and Using DocBook</a></dt><dt> <a href="#gdptemplates">GDP Document Templates</a></dt><dt> <a href="#screenshots">Screenshots</a></dt><dt> <a href="#applicationbugs">Application Bugs</a></dt><dt> <a href="#cvs">Using CVS</a></dt></dl></dd><dt> <a href="#gnomedocsystem">The GNOME Documentation System</a></dt><dd><dl><dt> <a href="#gnomehelpbrowser">The GNOME Help Browser</a></dt><dt> <a href="#gnomehelpbrowser2">The GNOME Help Browser (GNOME-2.0)</a></dt><dt> <a href="#gnomehelponthefly">Dynamic Document Synthesis(GNOME-2.0)</a></dt><dt> <a href="#gnomehelpcomponents">The GNOME Documentation Components</a></dt></dl></dd><dt> <a href="#docbookbasics">DocBook Basics </a></dt><dd><dl><dt> <a href="#introtodocbook">Introduction to DocBook</a></dt><dt> <a href="#xml">XML and SGML</a></dt><dt> <a href="#structure"> Structure Elements</a></dt><dt> <a href="#inline">Inline Elements</a></dt></dl></dd><dt> <a href="#conventions">GDP Documentation Conventions </a></dt><dd><dl><dt> <a href="#conventionsalldocs">Conventions for All GDP Documentation</a></dt><dt> <a href="#conventionsappdocs">Conventions for Application Documentation</a></dt></dl></dd><dt> <a href="#writingapplicationmanuals">Writing Application and Applet Manuals</a></dt><dt> <a href="#listingdocsinhelpmenu">Listing Documents in the Help Menu</a></dt><dt> <a href="#applicationhelpbuttons">Application Help Buttons</a></dt><dt> <a href="#packagingappletdocs">Packaging Applet Documentation</a></dt><dd><dl><dt> <a href="#appletfiles">Applet Documentation Files</a></dt><dt> <a href="#appletmenu">Adding Documentation to an Applet Menu</a></dt></dl></dd><dt> <a href="#writingcontextsensitivehelp">Writing Context Sensitive Help (coming in GNOME-2.0)</a></dt><dt> <a href="#referring">Referring to Other GNOME Documentation (coming in
- GNOME-2.0)</a></dt><dt> <a href="#basics">Basics of Documentation Style</a></dt><dd><dl><dt> <a href="#styleplanning">Planning</a></dt><dt> <a href="#balance">Achieving a Balanced Style</a></dt><dt> <a href="#stylestructure">Structure</a></dt><dt> <a href="#stylegrammar">Grammar and Spelling</a></dt></dl></dd><dt> <a href="#teamwork">Teamwork</a></dt><dd><dl><dt> <a href="#teamworkgdp">Working With The GDP Team</a></dt><dt> <a href="#teamworkdevelopers">Working With Developers</a></dt></dl></dd><dt> <a href="#finishing">Finishing A Document</a></dt><dd><dl><dt> <a href="#editting">Editing The Document</a></dt><dt> <a href="#submitting">Submitting The Document</a></dt></dl></dd><dt> <a href="#resources">Resources</a></dt><dd><dl><dt> <a href="#resourcesweb">Resources On The Web</a></dt><dt> <a href="#resourcesbooks">Books</a></dt><dt> <a href="#mailinglists">Mailing Lists</a></dt><dt> <a href="#irc">IRC</a></dt></dl></dd></dl></div><div class="sect1"><a name="intro"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="intro"/><span class="title">Introduction</span></h2></div></div><div class="sect2"><a name="gdp"/><div class="titlepage"><div><h3 class="title"><a name="gdp"/><span class="title">The GNOME Documentation Project</span></h3></div></div><div class="sect3"><a name="goals"/><div class="titlepage"><div><h4 class="title"><a name="goals"/><span class="title">Goals</span></h4></div></div><p>
+ GNOME-2.0)</a></dt><dt> <a href="#basics">Basics of Documentation Style</a></dt><dd><dl><dt> <a href="#styleplanning">Planning</a></dt><dt> <a href="#balance">Achieving a Balanced Style</a></dt><dt> <a href="#stylestructure">Structure</a></dt><dt> <a href="#stylegrammar">Grammar and Spelling</a></dt></dl></dd><dt> <a href="#teamwork">Teamwork</a></dt><dd><dl><dt> <a href="#teamworkgdp">Working With The GDP Team</a></dt><dt> <a href="#teamworkdevelopers">Working With Developers</a></dt></dl></dd><dt> <a href="#finishing">Finishing A Document</a></dt><dd><dl><dt> <a href="#editting">Editing The Document</a></dt><dt> <a href="#submitting">Submitting The Document</a></dt></dl></dd><dt> <a href="#resources">Resources</a></dt><dd><dl><dt> <a href="#resourcesweb">Resources On The Web</a></dt><dt> <a href="#resourcesbooks">Books</a></dt><dt> <a href="#mailinglists">Mailing Lists</a></dt><dt> <a href="#irc">IRC</a></dt></dl></dd><dt>A <a href="#templates">Document Templates</a></dt><dd><dl><dt> <a href="#template1">Template 1: Application Manual</a></dt><dt> <a href="#template2-1x">Template 2: Applet Manual For GNOME 1.x</a></dt><dt> <a href="#template2-2x">Template 2: Applet Manual For GNOME 2.x</a></dt></dl></dd></dl></div><div class="sect1"><a name="intro"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="intro"/>Introduction</h2></div></div><div class="sect2"><a name="gdp"/><div class="titlepage"><div><h3 class="title"><a name="gdp"/>The GNOME Documentation Project</h3></div></div><div class="sect3"><a name="goals"/><div class="titlepage"><div><h4 class="title"><a name="goals"/>Goals</h4></div></div><p>
The GNOME Documentation Project (GDP) aims to provide GNOME
and GNOME applications with a complete, intuitive, and clear
documentation system. At the center of the GDP is the
@@ -50,14 +50,14 @@
Guide</i></a>, the <a href="http://www.gnome.org/learn/" target="_top"><i>GNOME FAQ</i></a>, and
GNOME application documentation. Most GNOME applications
have their own manual in addition to context sensitive help.
- </p></div><div class="sect3"><a name="joining"/><div class="titlepage"><div><h4 class="title"><a name="joining"/><span class="title">Joining the GDP</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="joining"/><div class="titlepage"><div><h4 class="title"><a name="joining"/>Joining the GDP</h4></div></div><p>
Documenting GNOME and all the numerous GNOME applications is
a very large project. The GDP is always looking for people
to help write, update, and edit documentation. If you are
interested in joining the GDP team, you should join the
<a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top">
<i>gnome-doc-list mailing list</i> </a>.
- Read <a href="#gettingstarted">the section called &#x201C;Getting Started Writing GNOME Documentation&#x201D;</a>, for help selecting a
+ Read <a href="#gettingstarted" title="Getting Started Writing GNOME Documentation">the section called &#x201C;Getting Started Writing GNOME Documentation&#x201D;</a>, for help selecting a
project to work on. Feel free to introduce yourself on the
gnome-doc-list mailing list and indicate which project you
intend to work on, or else ask for suggestions of important
@@ -67,7 +67,7 @@
projects and members, see the
<a href="http://developer.gnome.org/projects/gdp" target="_top">
<i>GDP Website</i></a>.
- </p></div><div class="sect3"><a name="collaborating"/><div class="titlepage"><div><h4 class="title"><a name="collaborating"/><span class="title">Collaborating with the GDP</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="collaborating"/><div class="titlepage"><div><h4 class="title"><a name="collaborating"/>Collaborating with the GDP</h4></div></div><p>
GNOME developers, packagers, and translators may not be
writing GNOME documentation but will want to understand how
the GNOME documentation system works and will need to
@@ -82,9 +82,9 @@
and that the developer(s) would like a GDP member to write
documentation for the application. The #docs IRC channel on
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"/><span class="title">Notation and Conventions</span></h3></div></div><p>
+ </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="id2761030"><p/><a name="id2761030"/><table border="0"><colgroup><col/><col/></colgroup><tbody><tr><td><tt>/usr/bin</tt></td><td>
+ <div class="informaltable" id="id2767502"><a name="id2767502"/><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
@@ -92,8 +92,8 @@
Command or text that would be typed.
</td></tr><tr><td><b><i><tt>replaceable</tt></i></b></td><td>
&quot;Variable&quot; text that can be replaced.
- </td></tr><tr><td><tt>Program or Doc Code</tt></td><td>Program or document code</td></tr></tbody></table><p/></div>
- </p></div><div class="sect2"><a name="about"/><div class="titlepage"><div><h3 class="title"><a name="about"/><span class="title">About This Handbook</span></h3></div></div><p>
+ </td></tr><tr><td><tt>Program or Doc Code</tt></td><td>Program or document code</td></tr></tbody></table></div>
+ </p></div><div class="sect2"><a name="about"/><div class="titlepage"><div><h3 class="title"><a name="about"/>About This Handbook</h3></div></div><p>
This Handbook is a guide for both writing documentation for
GNOME components and applications and for properly binding and
packaging documentation into GNOME applications.
@@ -105,7 +105,7 @@
<i>Getting The GNOME Handbook of Writing Software
Documentation</i> </a>. Alternately, one may
download it anonymously from GNOME CVS under <tt>gnome-docu/gdp</tt>.
- </p></div></div><div class="sect1"><a name="gettingstarted"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="gettingstarted"/><span class="title">Getting Started Writing GNOME Documentation</span></h2></div></div><div class="sect2"><a name="selecting"/><div class="titlepage"><div><h3 class="title"><a name="selecting"/><span class="title">Selecting A Document</span></h3></div></div><div class="sect3"><a name="know"/><div class="titlepage"><div><h4 class="title"><a name="know"/><span class="title">Document Something You Know</span></h4></div></div><p>
+ </p></div></div><div class="sect1"><a name="gettingstarted"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="gettingstarted"/>Getting Started Writing GNOME Documentation</h2></div></div><div class="sect2"><a name="selecting"/><div class="titlepage"><div><h3 class="title"><a name="selecting"/>Selecting A Document</h3></div></div><div class="sect3"><a name="know"/><div class="titlepage"><div><h4 class="title"><a name="know"/>Document Something You Know</h4></div></div><p>
The most frequently asked question of new contributors who
join the GDP is &quot;which document should I start
with?&quot;. Because most people involved are volunteers, we do
@@ -126,7 +126,7 @@
material more clearly, just send your suggestions to the
author of the original documentation or to the GNOME
documentation project at <tt>&lt;<a href="mailto:docs@gnome.org">docs@gnome.org</a>&gt;</tt>.
- </p></div><div class="sect3"><a name="doctable"/><div class="titlepage"><div><h4 class="title"><a name="doctable"/><span class="title">The GNOME Documentation Status Table</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="doctable"/><div class="titlepage"><div><h4 class="title"><a name="doctable"/>The GNOME Documentation Status Table</h4></div></div><p>
The <i>GDP Documentation Status Table</i>
(<i>DocTable</i>) (<a href="http://www.gnome.org/gdp/doctable/" target="_top">http://www.gnome.org/gdp/doctable/</a>) is a
web page which tracks the status of all the various
@@ -148,19 +148,19 @@
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="id2752914">Note</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2765952"/>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
application, make sure you find out the latest status of
documentation by contacting the application author.
- </p></div></div></div><div class="sect2"><a name="docbook"/><div class="titlepage"><div><h3 class="title"><a name="docbook"/><span class="title">Installing and Using DocBook</span></h3></div></div><p>
+ </p></div></div></div><div class="sect2"><a name="docbook"/><div class="titlepage"><div><h3 class="title"><a name="docbook"/>Installing and Using DocBook</h3></div></div><p>
All documentation for the GNOME project is written in SGML
using the DocBook DTD. There are many advantages to using
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="id2753000">NOTE</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2766035"/>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">
@@ -168,7 +168,7 @@
</a>and a volunteer will mark it up for you. Seeing your
document marked up will also be a great way for you to start
learning DocBook.
- </p></div><div class="sect3"><a name="installingdocbook"/><div class="titlepage"><div><h4 class="title"><a name="installingdocbook"/><span class="title">Installing DocBook</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="installingdocbook"/><div class="titlepage"><div><h4 class="title"><a name="installingdocbook"/>Installing DocBook</h4></div></div><p>
Download and install the following <a href="ftp://sourceware.cygnus.com:/pub/docbook-tools/" target="_top">DocBook Tools packages</a>: jade, docbook,
jadetex, sgml-common, and stylesheets. (RPM users should note
that jade is platform dependent (eg. i386), while the other packages
@@ -179,7 +179,7 @@
If you are an Emacs user you may
want to grab the psgml package as well. This is a major mode
for editing sgml files in Emacs.
- </p></div><div class="sect3"><a name="gdpstylesheets"/><div class="titlepage"><div><h4 class="title"><a name="gdpstylesheets"/><span class="title">GDP Stylesheets</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="gdpstylesheets"/><div class="titlepage"><div><h4 class="title"><a name="gdpstylesheets"/>GDP Stylesheets</h4></div></div><p>
The GDP uses its own DocBook stylesheets. To use the GDP
stylesheets, you should download the file
<tt>gdp-both.dsl</tt> from the <tt>gnome-docu/gdp/dsssl</tt> module in
@@ -191,7 +191,7 @@
Alternately, you can download and install the
<a href="http://people.redhat.com/dcm/software.html" target="_top">gnome-doc-tools package</a> which will set
up the stylesheets as well as the DTD discussed below.
- </p></div><div class="sect3"><a name="gdpdtd"/><div class="titlepage"><div><h4 class="title"><a name="gdpdtd"/><span class="title">GDP DTD (PNG Image Support)</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="gdpdtd"/><div class="titlepage"><div><h4 class="title"><a name="gdpdtd"/>GDP DTD (PNG Image Support)</h4></div></div><p>
Due to some license issues involved with the creation of
gifs, the GNOME Documentation Project has decided to use the
PNG image format for all images in GNOME documentation. You
@@ -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><p><a name="id2753394"/>
+ </p><div class="itemizedlist"><ul><li><p><a name="id2766412"/>
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>&lt;legalnotice&gt;</tt> tag, so it is
recommended that you use version 3.1
- </p></li><li style="list-style-type: disc"><p><a name="id2753562"/>
+ </p></li><li style="list-style-type: disc"><p><a name="id2766580"/>
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
@@ -246,7 +246,7 @@ V1.1//EN&quot;[]&gt;
&lt;!DOCTYPE Book PUBLIC &quot;-//GNOME//DTD DocBook PNG Variant
V1.1//EN&quot;[]&gt;
</pre>
- </p></div><div class="sect3"><a name="editors"/><div class="titlepage"><div><h4 class="title"><a name="editors"/><span class="title">Editors</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="editors"/><div class="titlepage"><div><h4 class="title"><a name="editors"/>Editors</h4></div></div><p>
There are many editors on Linux and UNIX systems available
to you. Which editor you use to work on the sgml documents
is completely up to you, as long as the editor is able to
@@ -261,8 +261,8 @@ V1.1//EN&quot;[]&gt;
and effort in adding and closing tags. You will find the
psgml package in DocBook Tools, which is the standard set of
tools for the GDP. You may find out more about DocBook Tools
- in <a href="#installingdocbook">the section called &#x201C;Installing DocBook&#x201D;</a>.
- </p></div><div class="sect3"><a name="make-output"/><div class="titlepage"><div><h4 class="title"><a name="make-output"/><span class="title">Creating Something Useful with your Docs</span></h4></div></div><p>
+ in <a href="#installingdocbook" title="Installing DocBook">the section called &#x201C;Installing DocBook&#x201D;</a>.
+ </p></div><div class="sect3"><a name="make-output"/><div class="titlepage"><div><h4 class="title"><a name="make-output"/>Creating Something Useful with your Docs</h4></div></div><p>
The tools available in DocBook Tools allow you to convert
your sgml document to many different formats including html
and Postscript. The primary tool used to do the conversion
@@ -291,14 +291,14 @@ V1.1//EN&quot;[]&gt;
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="id2753468">NOTE</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2766486"/>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
Tools' default stylesheets will produce a different look
to your docs. You can read more about the GDP stylesheets
- in <a href="#gdpstylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
- </p></div></div><div class="sect3"><a name="jadeimages"/><div class="titlepage"><div><h4 class="title"><a name="jadeimages"/><span class="title">Images in DocBook Tools</span></h4></div></div><p>
+ in <a href="#gdpstylesheets" title="GDP Stylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
+ </p></div></div><div class="sect3"><a name="jadeimages"/><div class="titlepage"><div><h4 class="title"><a name="jadeimages"/>Images in DocBook Tools</h4></div></div><p>
If your document uses images you will need to take note of a
few things that should take place in order for you to make
use of those images in your output.
@@ -338,28 +338,28 @@ V1.1//EN&quot;[]&gt;
included in the gnome-doc-tools package, so if you are using
this package, you should already have
<b>img2eps</b> on you system.
- </p></div><div class="sect3"><a name="moredocbookinfo"/><div class="titlepage"><div><h4 class="title"><a name="moredocbookinfo"/><span class="title">Learning DocBook</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="moredocbookinfo"/><div class="titlepage"><div><h4 class="title"><a name="moredocbookinfo"/>Learning DocBook</h4></div></div><p>
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><p><a name="id2875379"/>
+ </p><div class="itemizedlist"><ul><li><p><a name="id2888630"/>
<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><p><a name="id2875434"/>
+ </p></li><li><p><a name="id2888686"/>
<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><p><a name="id2875475"/>
+ </p></li><li><p><a name="id2888726"/>
<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><p><a name="id2875514"/>
+ </p></li><li><p><a name="id2888766"/>
<a href="http://www.freebsd.org/tutorials/docproj-primer/" target="_top">
FreeBSD Documentation Project Primer for New
Contributors</a> - FreeBSD documentation project
@@ -372,30 +372,30 @@ V1.1//EN&quot;[]&gt;
</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><p><a name="id2875581"/>
- <a href="#docbookbasics">the section called &#x201C;DocBook Basics &#x201D;</a> - Descriptions of
+ </p><div class="itemizedlist"><ul><li><p><a name="id2888832"/>
+ <a href="#docbookbasics" title="DocBook Basics ">the section called &#x201C;DocBook Basics &#x201D;</a> - Descriptions of
commonly used DocBook tags.
</p></li></ul></div><p>
You may also discuss specific DocBook questions with GDP
members on the #docs IRC channel at irc.gnome.org and on the
gnome-doc-list mailing list.
- </p></div></div><div class="sect2"><a name="gdptemplates"/><div class="titlepage"><div><h3 class="title"><a name="gdptemplates"/><span class="title">GDP Document Templates</span></h3></div></div><p>
+ </p></div></div><div class="sect2"><a name="gdptemplates"/><div class="titlepage"><div><h3 class="title"><a name="gdptemplates"/>GDP Document Templates</h3></div></div><p>
Templates for various types of GNOME documents are found in
- <a href="#templates">Appendix A.</a>. They are kept in CVS in
+ <a href="#templates" title="A. Document Templates">Appendix A. Document Templates</a>. They are kept in CVS in
gnome-docu/gdp/templates. The easiest source to get them from
is probably the <a href="http://developer.gnome.org/projects/gdp/templates.html" target="_top">GDP
Document Templates</a> web page, which is typically kept
completely up-to-date with CVS and has a basic description of
each file from CVS.
- </p></div><div class="sect2"><a name="screenshots"/><div class="titlepage"><div><h3 class="title"><a name="screenshots"/><span class="title">Screenshots</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="screenshots"/><div class="titlepage"><div><h3 class="title"><a name="screenshots"/>Screenshots</h3></div></div><p>
Most GNOME documents will have screenshots of the particular
applet, application, GNOME component, or widget being
- discussed. As discussed above in <a href="#gdpdtd">the section called &#x201C;GDP DTD (PNG Image Support)&#x201D;</a> you
+ discussed. As discussed above in <a href="#gdpdtd" title="GDP DTD (PNG Image Support)">the section called &#x201C;GDP DTD (PNG Image Support)&#x201D;</a> you
will need to install the special GDP DocBook DTD which
supports PNG images, the format used for all images in GNOME
documentation. For the basic DocBook structure used to insert
- images in a document, see <a href="#jadeimages">the section called &#x201C;Images in DocBook Tools&#x201D;</a> above.
- </p><div class="sect3"><a name="screenshotappearance"/><div class="titlepage"><div><h4 class="title"><a name="screenshotappearance"/><span class="title">Screenshot Appearance</span></h4></div></div><p>
+ images in a document, see <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a> above.
+ </p><div class="sect3"><a name="screenshotappearance"/><div class="titlepage"><div><h4 class="title"><a name="screenshotappearance"/>Screenshot Appearance</h4></div></div><p>
For all screenshots of windows that typically have border
decorations (e.g. applications and dialogs, but not applets
in a panel), GDP standards dictate
@@ -416,7 +416,7 @@ V1.1//EN&quot;[]&gt;
<i>gnome-doc-list mailing list</i> </a>
requesting a GDP member reproduce these screenshots in the
correct format and email them to you.
- </p></div><div class="sect3"><a name="screenshottools"/><div class="titlepage"><div><h4 class="title"><a name="screenshottools"/><span class="title">Screenshot Tools</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="screenshottools"/><div class="titlepage"><div><h4 class="title"><a name="screenshottools"/>Screenshot Tools</h4></div></div><p>
There are many tools for taking screenshots in
GNOME/Linux. Perhaps the most convenient is the
Screen-Shooter Applet. Just click
@@ -437,12 +437,12 @@ V1.1//EN&quot;[]&gt;
gimp can both be used for taking
screenshots, cropping screenshots, and converting image
formats.
- </p></div><div class="sect3"><a name="screenshotfiles"/><div class="titlepage"><div><h4 class="title"><a name="screenshotfiles"/><span class="title">Screenshot Files</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="screenshotfiles"/><div class="titlepage"><div><h4 class="title"><a name="screenshotfiles"/>Screenshot Files</h4></div></div><p>
Screenshots should be kept in the main documentation
directory with your SGML file for applets, or should be
kept in a directory called &quot;figs&quot; for application and other
documentation. After you use <b>db2html</b> to
- convert your SGML file to HTML (see <a href="#make-output">the section called &#x201C;Creating Something Useful with your Docs&#x201D;</a>), you will need to copy your
+ convert your SGML file to HTML (see <a href="#make-output" title="Creating Something Useful with your Docs">the section called &#x201C;Creating Something Useful with your Docs&#x201D;</a>), you will need to copy your
screenshots (either the individual PNG files for applet
documentation, or the whole &quot;figs&quot; directory for other
documentation) into the newly created HTML directory. Note
@@ -450,10 +450,10 @@ V1.1//EN&quot;[]&gt;
directory is erased and rewritten, so do not store your only
copy of the screenshots in that directory. If you wish to
create PostScript or PDF output, you will need to manually
- convert the PNG images to EPS as described in <a href="#jadeimages">the section called &#x201C;Images in DocBook Tools&#x201D;</a>, but will not need to copy these
+ convert the PNG images to EPS as described in <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a>, but will not need to copy these
images from their default location, as they are included
directly into the output(PostScript of PDF) file.
- </p></div></div><div class="sect2"><a name="applicationbugs"/><div class="titlepage"><div><h3 class="title"><a name="applicationbugs"/><span class="title">Application Bugs</span></h3></div></div><p>
+ </p></div></div><div class="sect2"><a name="applicationbugs"/><div class="titlepage"><div><h3 class="title"><a name="applicationbugs"/>Application Bugs</h3></div></div><p>
Documentation authors tend to investigate and test applets and
applications more thoroughly than most
users. Often documentation authors will discover one or
@@ -466,7 +466,7 @@ V1.1//EN&quot;[]&gt;
submit a bug report is by using the Bug
Buddy applet which is part of the gnome-applets
package.
- </p></div><div class="sect2"><a name="cvs"/><div class="titlepage"><div><h3 class="title"><a name="cvs"/><span class="title">Using CVS</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="cvs"/><div class="titlepage"><div><h3 class="title"><a name="cvs"/>Using CVS</h3></div></div><p>
CVS (Concurrent Versions System) is a tool that allows
multiple developers to concurrently work on a set of
documents, keeping track of the modifications made by each
@@ -480,7 +480,7 @@ V1.1//EN&quot;[]&gt;
typically be emailed to the the application developer. Core
GDP members may also be granted login CVS privileges so they
may commit modified files directly to CVS.
- </p><div class="sect3"><a name="anonymouscvs"/><div class="titlepage"><div><h4 class="title"><a name="anonymouscvs"/><span class="title">Anonymous CVS</span></h4></div></div><p>
+ </p><div class="sect3"><a name="anonymouscvs"/><div class="titlepage"><div><h4 class="title"><a name="anonymouscvs"/>Anonymous CVS</h4></div></div><p>
To anonymously check out documents from CVS, you must first
log in. From the bash shell, you should set your CVSROOT
shell variable with <b> export
@@ -493,7 +493,7 @@ V1.1//EN&quot;[]&gt;
gnome-docu/gdp</b>. After you have this document
checked out and you would like to download any updates on
the CVS server, use <b>cvs -z3 update -Pd</b>.
- </p></div><div class="sect3"><a name="logincvs"/><div class="titlepage"><div><h4 class="title"><a name="logincvs"/><span class="title">Login CVS</span></h4></div></div><p> If you have been given a
+ </p></div><div class="sect3"><a name="logincvs"/><div class="titlepage"><div><h4 class="title"><a name="logincvs"/>Login CVS</h4></div></div><p> If you have been given a
login for the GNOME CVS server, you may commit your file
modifications to CVS. Be sure to read the following section
on CVS etiquette before making any commits to CVS. To log in
@@ -520,7 +520,7 @@ V1.1//EN&quot;[]&gt;
add a new file to the CVS server, use <b>cvs -z3 add
<i><tt>filename</tt></i></b>, followed by the
commit command.
- </p></div><div class="sect3"><a name="cvsetiquette"/><div class="titlepage"><div><h4 class="title"><a name="cvsetiquette"/><span class="title">CVS Etiquette</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="cvsetiquette"/><div class="titlepage"><div><h4 class="title"><a name="cvsetiquette"/>CVS Etiquette</h4></div></div><p>
Because files in CVS are typically used and modified by
multiple developers and documentation authors, users should
exercise a few simple practices out of courtesy towards the
@@ -535,7 +535,7 @@ V1.1//EN&quot;[]&gt;
is being modified. When modifying files created by others,
you should follow the indentation scheme used by the initial
author.
- </p></div></div></div><div class="sect1"><a name="gnomedocsystem"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="gnomedocsystem"/><span class="title">The GNOME Documentation System</span></h2></div></div><div class="sect2"><a name="gnomehelpbrowser"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpbrowser"/><span class="title">The GNOME Help Browser</span></h3></div></div><p>
+ </p></div></div></div><div class="sect1"><a name="gnomedocsystem"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="gnomedocsystem"/>The GNOME Documentation System</h2></div></div><div class="sect2"><a name="gnomehelpbrowser"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpbrowser"/>The GNOME Help Browser</h3></div></div><p>
At the core of the GNOME help system is the GNOME
Help Browser. The Help
Browser provides a unified interface to several
@@ -549,7 +549,7 @@ V1.1//EN&quot;[]&gt;
presented. Thus, the documentation that appears in the GHB is
specific to each computer and will typically only represent
software that is installed on the computer.
- </p></div><div class="sect2"><a name="gnomehelpbrowser2"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpbrowser2"/><span class="title">The GNOME Help Browser (GNOME-2.0)</span></h3></div></div><p> In
+ </p></div><div class="sect2"><a name="gnomehelpbrowser2"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpbrowser2"/>The GNOME Help Browser (GNOME-2.0)</h3></div></div><p> In
GNOME 2.0, the GNOME Help Browser
will be replaced by Nautilus.
Nautilus will be the file manager/graphical shell for GNOME 2.0
@@ -567,7 +567,7 @@ V1.1//EN&quot;[]&gt;
display documents which are on the web as well as those on the
local file system. For more information on
Nautilus, visit the #nautilus IRC
- channel on irc.gnome.org. </p></div><div class="sect2"><a name="gnomehelponthefly"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelponthefly"/><span class="title">Dynamic Document Synthesis(GNOME-2.0)</span></h3></div></div><p>
+ channel on irc.gnome.org. </p></div><div class="sect2"><a name="gnomehelponthefly"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelponthefly"/>Dynamic Document Synthesis(GNOME-2.0)</h3></div></div><p>
GNOME uses the documentation presented by all the various
GNOME components and applications installed on the system to
present a complete and customized documentation environment
@@ -579,14 +579,14 @@ V1.1//EN&quot;[]&gt;
By using such a system, you can be sure that any GNOME app you
install that has documentation will show up in the index,
table of contents, any search you do in the help browser.
- </p></div><div class="sect2"><a name="gnomehelpcomponents"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpcomponents"/><span class="title">The GNOME Documentation Components</span></h3></div></div><div class="sect3"><a name="applicationmanualsintro"/><div class="titlepage"><div><h4 class="title"><a name="applicationmanualsintro"/><span class="title">Application Manuals</span></h4></div></div><p>
+ </p></div><div class="sect2"><a name="gnomehelpcomponents"/><div class="titlepage"><div><h3 class="title"><a name="gnomehelpcomponents"/>The GNOME Documentation Components</h3></div></div><div class="sect3"><a name="applicationmanualsintro"/><div class="titlepage"><div><h4 class="title"><a name="applicationmanualsintro"/>Application Manuals</h4></div></div><p>
Every GNOME application should have an application manual.
An application manual is a document specific to the
particular application which explains the various windows
and features of the application. Application Manuals
typically use screenshots (PNG format) for clarity. Writing
- application manuals is discussed in more detail in <a href="#writingapplicationmanuals">the section called &#x201C;Writing Application and Applet Manuals&#x201D;</a> below.
- </p></div><div class="sect3"><a name="applicationhelpintro"/><div class="titlepage"><div><h4 class="title"><a name="applicationhelpintro"/><span class="title">Application Help</span></h4></div></div><p>
+ application manuals is discussed in more detail in <a href="#writingapplicationmanuals" title="Writing Application and Applet Manuals">the section called &#x201C;Writing Application and Applet Manuals&#x201D;</a> below.
+ </p></div><div class="sect3"><a name="applicationhelpintro"/><div class="titlepage"><div><h4 class="title"><a name="applicationhelpintro"/>Application Help</h4></div></div><p>
Applications should have a Help
button on screens on which users may need help. These
Help buttons should pull up the
@@ -596,18 +596,18 @@ V1.1//EN&quot;[]&gt;
GNOME Help Browser. The help
browser should show either the first page of the application
manual, or else the relevant page thereof. Application help
- is described in more detail in <a href="#applicationhelpbuttons">the section called &#x201C;Application Help Buttons&#x201D;</a> below.
- </p></div><div class="sect3"><a name="contextsensitivehelpintro"/><div class="titlepage"><div><h4 class="title"><a name="contextsensitivehelpintro"/><span class="title">Application Context Sensitive Help (coming in
- GNOME-2.0)</span></h4></div></div><p>
+ is described in more detail in <a href="#applicationhelpbuttons" title="Application Help Buttons">the section called &#x201C;Application Help Buttons&#x201D;</a> below.
+ </p></div><div class="sect3"><a name="contextsensitivehelpintro"/><div class="titlepage"><div><h4 class="title"><a name="contextsensitivehelpintro"/>Application Context Sensitive Help (coming in
+ GNOME-2.0)</h4></div></div><p>
Context sensitive help is a system which will allow the user
to query any part (button, widget, etc.) of an application
window. This is done by either entering a CS Help mode by
clicking on an icon or by right clicking on the application
part and selecting &quot;What's This&quot; or whatever is decided on
at the time. Context sensitive help is described in more
- detail in <a href="#writingcontextsensitivehelp">the section called &#x201C;Writing Context Sensitive Help (coming in GNOME-2.0)&#x201D;</a>
+ detail in <a href="#writingcontextsensitivehelp" title="Writing Context Sensitive Help (coming in GNOME-2.0)">the section called &#x201C;Writing Context Sensitive Help (coming in GNOME-2.0)&#x201D;</a>
below.
- </p></div><div class="sect3"><a name="userguide"/><div class="titlepage"><div><h4 class="title"><a name="userguide"/><span class="title">The GNOME User Guide</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="userguide"/><div class="titlepage"><div><h4 class="title"><a name="userguide"/>The GNOME User Guide</h4></div></div><p>
The <i>GNOME User Guide</i> describes the
GNOME desktop environment and core components of GNOME such
as the panel and
@@ -616,14 +616,14 @@ V1.1//EN&quot;[]&gt;
this will become a document for the web and for printing
that is derived from various parts chosen in the system that
are necessary for the new user to understand.
- </p></div><div class="sect3"><a name="userdocs"/><div class="titlepage"><div><h4 class="title"><a name="userdocs"/><span class="title">User Documents</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="userdocs"/><div class="titlepage"><div><h4 class="title"><a name="userdocs"/>User Documents</h4></div></div><p>
Aside from the <i>GNOME User Guide</i>,
there are several other documents to help GNOME users learn
GNOME, including the <i>GNOME FAQ</i>,
<i>GNOME Installation and Configuration
Guide</i>, and the <i>GNOME Administrators
Guide</i>.
- </p></div><div class="sect3"><a name="developerdocs"/><div class="titlepage"><div><h4 class="title"><a name="developerdocs"/><span class="title">Developer Documents</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="developerdocs"/><div class="titlepage"><div><h4 class="title"><a name="developerdocs"/>Developer Documents</h4></div></div><p>
There are many White Papers, Tutorials, HOWTO's and FAQ's to
make programming GNOME and GNOME applications as easy as
possible.
@@ -632,12 +632,12 @@ V1.1//EN&quot;[]&gt;
detailed documentation of the code that is used to build GNOME
apps. You can keep up with the GNOME API docs on the <a href="http://developer.gnome.org/doc/API/" target="_top">GNOME API
Reference</a> page.
- </p></div><div class="sect3"><a name="projectdocs"/><div class="titlepage"><div><h4 class="title"><a name="projectdocs"/><span class="title">Project Documents</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="projectdocs"/><div class="titlepage"><div><h4 class="title"><a name="projectdocs"/>Project Documents</h4></div></div><p>
Some GNOME projects have documentation to maintain
consistency in their product and to help new contributors
get up to speed quickly. Among these are the GDP documents,
such as the one you are reading now.
- </p></div></div></div><div class="sect1"><a name="docbookbasics"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="docbookbasics"/><span class="title">DocBook Basics </span></h2></div></div><div class="sect2"><a name="introtodocbook"/><div class="titlepage"><div><h3 class="title"><a name="introtodocbook"/><span class="title">Introduction to DocBook</span></h3></div></div><p>
+ </p></div></div></div><div class="sect1"><a name="docbookbasics"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="docbookbasics"/>DocBook Basics </h2></div></div><div class="sect2"><a name="introtodocbook"/><div class="titlepage"><div><h3 class="title"><a name="introtodocbook"/>Introduction to DocBook</h3></div></div><p>
To understand DocBook, a basic understanding of SGML is
helpful. SGML stands for Standard General Markup Language and
is one of the first markup languages every created. HTML is
@@ -658,7 +658,7 @@ V1.1//EN&quot;[]&gt;
readable format, you need special tools. The GDP uses <i>DocBook
Tools</i>, a free package of utilities for working with DocBook
which includes <i>Jade</i>, which does the SGML/DSSL
- parsing. You can read more about DocBook Tools in <a href="#installingdocbook">the section called &#x201C;Installing DocBook&#x201D;</a>.
+ parsing. You can read more about DocBook Tools in <a href="#installingdocbook" title="Installing DocBook">the section called &#x201C;Installing DocBook&#x201D;</a>.
</p><p>
The final appearance of the output (e.g. PostScript or HTML)
is determined by a
@@ -670,7 +670,7 @@ V1.1//EN&quot;[]&gt;
numbering style, and much more. DocBook tools come with a
collection of stylesheets (Norman Walsh's modular
stylesheets); GNOME Document Project uses some customized
- version of this stylesheets -- see <a href="#gdpstylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
+ version of this stylesheets -- see <a href="#gdpstylesheets" title="GDP Stylesheets">the section called &#x201C;GDP Stylesheets&#x201D;</a>.
</p><p>
The advantage of specifying the <i>structure</i>
of a document with SGML instead of specifying the
@@ -697,11 +697,11 @@ V1.1//EN&quot;[]&gt;
same.
</p><p>
As stated before, the GDP uses the DocBook DTD. For a list of
- introductory and reference resources on DocBook, see <a href="#resources">the section called &#x201C;Resources&#x201D;</a>. The following sections also provide
+ introductory and reference resources on DocBook, see <a href="#resources" title="Resources">the section called &#x201C;Resources&#x201D;</a>. The following sections also provide
convenient instructions on which markup tags to use in various
- circumstances. Be sure to read <a href="#conventions">the section called &#x201C;GDP Documentation Conventions &#x201D;</a>
+ circumstances. Be sure to read <a href="#conventions" title="GDP Documentation Conventions ">the section called &#x201C;GDP Documentation Conventions &#x201D;</a>
for GDP documentation-specific guidelines.
- </p></div><div class="sect2"><a name="xml"/><div class="titlepage"><div><h3 class="title"><a name="xml"/><span class="title">XML and SGML</span></h3></div></div><p> In not so distant future (probably before GNOME 2.0),
+ </p></div><div class="sect2"><a name="xml"/><div class="titlepage"><div><h3 class="title"><a name="xml"/>XML and SGML</h3></div></div><p> In not so distant future (probably before GNOME 2.0),
DocBook itself and GNOME Documentation project will migrate from
SGML to XML. This transition should be relatively painless:
(almost) all DocBook tags will remain the same. However, XML has
@@ -710,7 +710,7 @@ V1.1//EN&quot;[]&gt;
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="id2877873"/><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2877892"/>
+ </p><div class="variablelist"><dl><dt><a name="id2891124"/><span class="term"> <i>Minimization</i></span></dt><dd><p><a name="id2891143"/>
It is possible with some implementations of SGML to use
minimizations to close elements in a document by using
&lt;/&gt;, for example:
@@ -721,7 +721,7 @@ V1.1//EN&quot;[]&gt;
if you are using Emacs with psgml
mode, you can also use menu command
Modify-&gt;Normalize.
- </p></dd><dt><a name="id2877974"/><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2877994"/>
+ </p></dd><dt><a name="id2891226"/><span class="term"> <i>Self-closing tags</i></span></dt><dd><p><a name="id2891245"/>
Also, in SGML some tags are allowed not to have closing
tags. For example, it is legal for
<tt>&lt;xref&gt;</tt> not to have a closing tag:
@@ -731,14 +731,14 @@ V1.1//EN&quot;[]&gt;
<tt><tt>&lt;xref
linkend=&quot;someid&quot;/&gt;</tt></tt> (note the
slash!).
- </p></dd><dt><a name="id2878047"/><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2878067"/>
+ </p></dd><dt><a name="id2891298"/><span class="term"> <i>Case sensitive tags</i></span></dt><dd><p><a name="id2891318"/>
In XML, unlike SGML, tags are case-senstive
<tt>&lt;title&gt;</tt> and
<tt>&lt;TITLE&gt;</tt> are different tags!
Therefore, please always use lowercase tags (except for
things like <tt>DOCTYPE, CDATA</tt> and
<tt>ENTITY</tt>, which are not DocBook tags).
- </p></dd></dl></div></div><div class="sect2"><a name="structure"/><div class="titlepage"><div><h3 class="title"><a name="structure"/><span class="title"> Structure Elements</span></h3></div></div><div class="sect3"><a name="section"/><div class="titlepage"><div><h4 class="title"><a name="section"/><span class="title">Sections and paragraphs</span></h4></div></div><p>
+ </p></dd></dl></div></div><div class="sect2"><a name="structure"/><div class="titlepage"><div><h3 class="title"><a name="structure"/> Structure Elements</h3></div></div><div class="sect3"><a name="section"/><div class="titlepage"><div><h4 class="title"><a name="section"/>Sections and paragraphs</h4></div></div><p>
Top-level element of a book body must be
<tt>&lt;chapter&gt;</tt>; it may contain one or more
<tt>&lt;sect1&gt;</tt>, each of them may contain
@@ -756,7 +756,7 @@ V1.1//EN&quot;[]&gt;
</p><p> Use the tag <tt>&lt;para&gt;</tt> for
paragraphs, even if there is only one paragraph in a
section--see template for examples.
- </p></div><div class="sect3"><a name="notes"/><div class="titlepage"><div><h4 class="title"><a name="notes"/><span class="title">Notes, Warnings, And Tips</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="notes"/><div class="titlepage"><div><h4 class="title"><a name="notes"/>Notes, Warnings, And Tips</h4></div></div><p>
For notes, tips, warnings, and important information, which
should be set apart from the main text (usually as a
paragraph with some warning sign on the margin), use tags
@@ -772,13 +772,13 @@ V1.1//EN&quot;[]&gt;
compiler with Pentium optimization.
&lt;/para&gt;
&lt;/tip&gt; </pre> produces
- </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="extip">TIP</a></h3><p>
+ </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="extip"/>TIP</h3><p>
To speed up program compilation, use
gcc compiler with Pentium
optimization. </p></div><p>
Note that this should not be inside a
<tt>&lt;para&gt;</tt> but between paragraphs.
- </p></div><div class="sect3"><a name="figures"/><div class="titlepage"><div><h4 class="title"><a name="figures"/><span class="title"> Screenshots and other figures</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="figures"/><div class="titlepage"><div><h4 class="title"><a name="figures"/> Screenshots and other figures</h4></div></div><p>
To include screenshots and other figures, use the following
tags:
@@ -797,11 +797,11 @@ V1.1//EN&quot;[]&gt;
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="id2878538">NOTE</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2891789"/>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">the section called &#x201C;Images in DocBook Tools&#x201D;</a>.
- </p></div></div><div class="sect3"><a name="listing"/><div class="titlepage"><div><h4 class="title"><a name="listing"/><span class="title">Program listings and terminal session</span></h4></div></div><p>
+ why, please read <a href="#jadeimages" title="Images in DocBook Tools">the section called &#x201C;Images in DocBook Tools&#x201D;</a>.
+ </p></div></div><div class="sect3"><a name="listing"/><div class="titlepage"><div><h4 class="title"><a name="listing"/>Program listings and terminal session</h4></div></div><p>
To show a file fragment--for example, program
listing--use <tt>&lt;programlisting&gt;</tt> tag:
<pre class="programlisting">
@@ -845,7 +845,7 @@ make: *** No rule to make target `love'. Stop.
Note the use of tags <tt>&lt;prompt&gt;</tt> and
<tt>&lt;userinput&gt;</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="id2878750">NOTE</a></h3><p>
+ <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2892001"/>NOTE</h3><p>
Note that both <tt>&lt;programlisting&gt;</tt>
and <tt>&lt;screen&gt;</tt> preserve linebreaks,
but interpret SGML tags (unlike LaTeX
@@ -853,12 +853,12 @@ make: *** No rule to make target `love'. Stop.
the source of this document to see how you can have SGML
tags literally shown but not interpreted,
</p></div>
- </p></div><div class="sect3"><a name="lists"/><div class="titlepage"><div><h4 class="title"><a name="lists"/><span class="title"> Lists</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="lists"/><div class="titlepage"><div><h4 class="title"><a name="lists"/> Lists</h4></div></div><p>
The most common list types in DocBook are
<tt>&lt;itemizedlist&gt;</tt>,
<tt>&lt;orderedlist&gt;</tt>, and
<tt>&lt;variablelist&gt;</tt>.
- </p><div class="variablelist"><dl><dt><a name="id2878869"/><span class="term"> <tt>&lt;itemizedlist&gt;</tt></span></dt><dd><p><a name="id2878889"/>
+ </p><div class="variablelist"><dl><dt><a name="id2892120"/><span class="term"> <tt>&lt;itemizedlist&gt;</tt></span></dt><dd><p><a name="id2892140"/>
This is the simplest unnumbered list, parallel to
<tt>&lt;ul&gt;</tt> in HTML. Here is an example:
<pre class="programlisting">
@@ -889,33 +889,34 @@ make: *** No rule to make target `love'. Stop.
</pre>
and output:
- </p><div class="itemizedlist"><ul><li><p><a name="id2878907"/>
+ </p><div class="itemizedlist"><ul><li><p><a name="id2892158"/>
Show backup files --
This will show any backup file that might be on
your system.
- </p></li><li><p><a name="id2878970"/>
+ </p></li><li><p><a name="id2892221"/>
Show hidden files --
This will show all &quot;dot files&quot; or files that
begin with a dot. This files typically include
configuration files and directories.
- </p></li><li><p><a name="id2878996"/>
+ </p></li><li><p><a name="id2892248"/>
Mix files and directories
-- This option will display files and
directories in the order you sort them instead
of always having directories shown above files.
</p></li></ul></div><p> Note the use of <tt>&amp;mdash;</tt>
- for long dash (see <a href="#specsymb">the section called &#x201C; Special symbols &#x201D;</a>). Also,
+ for long dash (see <a href="#specsymb" title=" Special symbols ">the section called &#x201C; Special symbols &#x201D;</a>). Also,
please note that the result looks much nicer because the
terms being explained (Show backup
files, etc.) are set in a different font. In
- this case, it was achieved by using <a href="#gui"><tt>&lt;guilabel&gt;</tt></a>
+ this case, it was achieved by using <a href="#gui" title="GUI elements"><tt>&lt;guilabel&gt;</tt></a>
tag. In other cases, use appropriate tags such as
- <a href="#gui"><tt>&lt;guimenuitem&gt;</tt></a>,
- <a href="#filenames"><tt>&lt;command&gt;</tt></a>,
+ <a href="#gui" title="GUI elements"><tt>&lt;guimenuitem&gt;</tt></a>,
+ <a href="#filenames" title="Filenames, commands, and other
+ computer-related things"><tt>&lt;command&gt;</tt></a>,
or -- if none of
this applies -- use
- <a href="#gui"><tt>&lt;emphasis&gt;</tt></a>.
- </p></dd><dt><a name="id2879163"/><span class="term"> <tt>&lt;orderedlist&gt;</tt></span></dt><dd><p><a name="id2879181"/>
+ <a href="#gui" title="GUI elements"><tt>&lt;emphasis&gt;</tt></a>.
+ </p></dd><dt><a name="id2892414"/><span class="term"> <tt>&lt;orderedlist&gt;</tt></span></dt><dd><p><a name="id2892432"/>
This list is completely analogous to
<tt>&lt;itemizedlist&gt;</tt> and has the same
syntax, but it produces numbered list. By default,
@@ -928,7 +929,7 @@ make: *** No rule to make target `love'. Stop.
<tt>loweralpha</tt>,
<tt>upperroman</tt>,
<tt>lowerroman</tt>.
- </p></dd><dt><a name="id2879261"/><span class="term"> <tt>&lt;variablelist&gt;</tt></span></dt><dd><p><a name="id2879281"/> This list is used when each entry is
+ </p></dd><dt><a name="id2892512"/><span class="term"> <tt>&lt;variablelist&gt;</tt></span></dt><dd><p><a name="id2892532"/> 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>&lt;variablelist&gt;</tt> is more complicated
@@ -969,25 +970,25 @@ make: *** No rule to make target `love'. Stop.
are smart enough to change the numeration (for
<tt>&lt;orderedlist&gt;</tt>) or marks of each entry
(in <tt>&lt;itemizedlist&gt;</tt>) for sub-lists
- </p></div></div><div class="sect2"><a name="inline"/><div class="titlepage"><div><h3 class="title"><a name="inline"/><span class="title">Inline Elements</span></h3></div></div><div class="sect3"><a name="gui"/><div class="titlepage"><div><h4 class="title"><a name="gui"/><span class="title">GUI elements</span></h4></div></div><div class="itemizedlist"><ul><li><p><a name="id2879438"/>
+ </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="id2892689"/>
<tt>&lt;guibutton&gt;</tt> -- used for
buttons, including checkbuttons and radio buttons
- </p></li><li><p><a name="id2879464"/>
+ </p></li><li><p><a name="id2892715"/>
<tt>&lt;guimenu&gt;</tt>,
<tt>&lt;guisubmenu&gt;</tt> --used for
top-level menus and submenus
respectively, for example <tt>
&lt;guisubmenu&gt;Utilities&lt;/guisubmenu&gt; submenu of the
&lt;guimenu&gt;Main Menu&lt;/guimenu&gt;</tt>
- </p></li><li><p><a name="id2879508"/>
+ </p></li><li><p><a name="id2892759"/>
<tt>&lt;guimenuitem&gt;</tt>--an entry in a
menu
- </p></li><li><p><a name="id2879534"/>
+ </p></li><li><p><a name="id2892785"/>
<tt>&lt;guiicon&gt;</tt>--an icon
- </p></li><li><p><a name="id2879558"/>
+ </p></li><li><p><a name="id2892809"/>
<tt>&lt;guilabel&gt;</tt>--for items which have
labels, like tabs, or bounding boxes.
- </p></li><li><p><a name="id2879583"/>
+ </p></li><li><p><a name="id2892834"/>
<tt>&lt;interface&gt;</tt>-- for most everything
else... a window, a dialog box, the Panel, etc.
</p></li></ul></div><p>
@@ -1001,7 +1002,7 @@ make: *** No rule to make target `love'. Stop.
&lt;guimenu&gt;Main Menu&lt;/guimenu&gt; &lt;guisubmenu&gt;Utilities&lt;/guisubmenu&gt;
&lt;guimenuitem&gt;GNOME terminal&lt;/guimenuitem&gt; &lt;/menuchoice&gt;
</pre>
- </p></div><div class="sect3"><a name="links"/><div class="titlepage"><div><h4 class="title"><a name="links"/><span class="title">Links and references</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="links"/><div class="titlepage"><div><h4 class="title"><a name="links"/>Links and references</h4></div></div><p>
To refer to another place in the same document, you can use
tags <tt>&lt;xref&gt;</tt> and
<tt>&lt;link&gt;</tt>. The first of them
@@ -1012,10 +1013,10 @@ make: *** No rule to make target `love'. Stop.
An example of a &lt;link linkend=&quot;extip&quot;&gt;tip&lt;/link&gt; was given in
&lt;xref linkend=&quot;notes&quot; /&gt;.
</pre>
- which produces: An example of a <a href="#extip">tip</a> was given in <a href="#notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a>.
+ which produces: An example of a <a href="#extip">tip</a> was given in <a href="#notes" title="Notes, Warnings, And Tips">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a>.
</p><p>
Here <tt>notes</tt> and <tt>extip</tt>
- are the id attributes of <a href="#notes">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a> and of the
+ are the id attributes of <a href="#notes" title="Notes, Warnings, And Tips">the section called &#x201C;Notes, Warnings, And Tips&#x201D;</a> and of the
example of a tip in it.
</p><p> To produce a link to an external source, such as a
Web page or a local file, use <tt>&lt;ulink&gt;</tt>
@@ -1031,39 +1032,39 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
most cases, however, use of <tt>mailto</tt> is
unnecessary--see discussion of
<tt>&lt;email&gt;</tt> tag).
- </p></div><div class="sect3"><a name="filenames"/><div class="titlepage"><div><h4 class="title"><a name="filenames"/><span class="title">Filenames, commands, and other
- computer-related things</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="filenames"/><div class="titlepage"><div><h4 class="title"><a name="filenames"/>Filenames, commands, and other
+ 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="id2879940"/> <tt>&lt;filename&gt;</tt> -- used
+ </p><div class="itemizedlist"><ul><li><p><a name="id2893191"/> <tt>&lt;filename&gt;</tt> -- used
for filenames,
e.g.<tt>&lt;filename&gt;</tt>
foo.sgml
<tt>&lt;/filename&gt;</tt>
produces: <tt>foo.sgml</tt>.
- </p></li><li><p><a name="id2879990"/> <tt>&lt;filename
+ </p></li><li><p><a name="id2893241"/> <tt>&lt;filename
class=&quot;directory&quot;&gt;</tt> -- used for
directories, e.g.<tt>&lt;filename
class=&quot;directory&quot;&gt;</tt>/usr/bin
<tt>&lt;/filename&gt;</tt>
produces: <tt>/usr/bin</tt>.
- </p></li><li><p><a name="id2880046"/>
+ </p></li><li><p><a name="id2893297"/>
<tt>&lt;application&gt;</tt> -- used for
application names,
e.g. <tt>&lt;application&gt;</tt>Gnumeric
<tt>&lt;/application&gt;</tt> produces:
Gnumeric.
- </p></li><li><p><a name="id2880096"/>
+ </p></li><li><p><a name="id2893347"/>
<tt>&lt;envar&gt;</tt> -- used for
environment variables, e.g.
<tt>&lt;envar&gt;</tt>PATH<tt>&lt;/envar&gt;</tt>.
- </p></li><li><p><a name="id2880137"/>
+ </p></li><li><p><a name="id2893388"/>
<tt>&lt;command&gt;</tt> -- used for
commands entered on command line, e.g.
<tt>&lt;command&gt;</tt>make install
<tt>&lt;/command&gt;</tt> produces:
<b>make install</b>.
- </p></li><li><p><a name="id2880186"/>
+ </p></li><li><p><a name="id2893438"/>
<tt>&lt;replaceable&gt;</tt> -- used for
replaceable text, e.g.
<tt>&lt;command&gt;</tt>db2html<tt>&lt;replaceable&gt;</tt>
@@ -1071,7 +1072,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
<tt>&lt;/replaceable&gt;</tt><tt>&lt;/command&gt;</tt>
produces: <b>db2html
<i><tt>foo.sgml</tt></i></b>.
- </p></li></ul></div></div><div class="sect3"><a name="keys"/><div class="titlepage"><div><h4 class="title"><a name="keys"/><span class="title">Keyboard input</span></h4></div></div><p> To mark up text input by the user, use
+ </p></li></ul></div></div><div class="sect3"><a name="keys"/><div class="titlepage"><div><h4 class="title"><a name="keys"/>Keyboard input</h4></div></div><p> To mark up text input by the user, use
<tt>&lt;userinput&gt;</tt>.
</p><p> To mark keystrokes such as shortcuts and other
commands, use <tt>&lt;keycap&gt;</tt>.
@@ -1080,9 +1081,9 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
other tags for keys, too: <tt>&lt;keysym&gt;</tt>
and <tt>&lt;keycode&gt;</tt>. However you are
unlikely to need these for most documentation. For reference,
- <tt>&lt;keysym&gt;</tt> is for the `symbolic
- name' of a key. <tt>&lt;keycode&gt;</tt> is
- for the `scan code' of a key. These are not
+ <tt>&lt;keysym&gt;</tt> is for the &#x2018;symbolic
+ name&#x2019; of a key. <tt>&lt;keycode&gt;</tt> is
+ for the &#x2018;scan code&#x2019; of a key. These are not
terms commonly required in GNOME documentation,
although <tt>&lt;keysym&gt;</tt> is useful for marking
up control codes.
@@ -1111,7 +1112,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
</pre>
which produces simply
Quit (<b>Ctrl-q</b>)
- </p></div><div class="sect3"><a name="email"/><div class="titlepage"><div><h4 class="title"><a name="email"/><span class="title">E-mail addresses</span></h4></div></div><p> To mark up e-mail
+ </p></div><div class="sect3"><a name="email"/><div class="titlepage"><div><h4 class="title"><a name="email"/>E-mail addresses</h4></div></div><p> To mark up e-mail
address, use <tt>&lt;email&gt;</tt>:
<pre class="programlisting">
The easiest way to get in touch with me is by e-mail
@@ -1121,7 +1122,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
by e-mail (<tt>&lt;<a href="mailto:me@mydomain.com">me@mydomain.com</a>&gt;</tt>) Note that
<tt>&lt;email&gt;</tt> automatically produces a link
in html version.
- </p></div><div class="sect3"><a name="specsymb"/><div class="titlepage"><div><h4 class="title"><a name="specsymb"/><span class="title"> Special symbols </span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="specsymb"/><div class="titlepage"><div><h4 class="title"><a name="specsymb"/> Special symbols </h4></div></div><p>
DocBook also provides special means for entering
typographic symbols which can not be entered directly
form the keyboard (such as copyright sign). This is done using
@@ -1131,15 +1132,15 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
is required.
</p><p>
here is partial list of most commonly used enitites:
- </p><div class="itemizedlist"><ul><li><p><a name="id2880626"/>
+ </p><div class="itemizedlist"><ul><li><p><a name="id2893877"/>
<tt>&amp;amp;</tt> -- ampersend (&amp;)
- </p></li><li><p><a name="id2880645"/>
+ </p></li><li><p><a name="id2893896"/>
<tt>&amp;lt;</tt> -- left angle bracket (&lt;)
- </p></li><li><p><a name="id2880664"/>
+ </p></li><li><p><a name="id2893915"/>
<tt>&amp;copy;</tt> -- copyright sign (©)
- </p></li><li><p><a name="id2880683"/>
+ </p></li><li><p><a name="id2893934"/>
<tt>&amp;mdash;</tt> -- long dash (--)
- </p></li><li><p><a name="id2880702"/>
+ </p></li><li><p><a name="id2893953"/>
<tt>&amp;hellip;</tt> -- ellipsis (...)
</p></li></ul></div><p>
Note that the actual look of the resulting symbols depends
@@ -1148,17 +1149,17 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
exactly like the usual dash (-). However, in the PostScript
(and thus, in print) the output will look markedly better if
you use appropriate tags.
- </p></div></div></div><div class="sect1"><a name="conventions"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="conventions"/><span class="title">GDP Documentation Conventions </span></h2></div></div><div class="sect2"><a name="conventionsalldocs"/><div class="titlepage"><div><h3 class="title"><a name="conventionsalldocs"/><span class="title">Conventions for All GDP Documentation</span></h3></div></div><div class="sect3"><a name="xmlcomp"/><div class="titlepage"><div><h4 class="title"><a name="xmlcomp"/><span class="title"> XML compatibility </span></h4></div></div><p>
+ </p></div></div></div><div class="sect1"><a name="conventions"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="conventions"/>GDP Documentation Conventions </h2></div></div><div class="sect2"><a name="conventionsalldocs"/><div class="titlepage"><div><h3 class="title"><a name="conventionsalldocs"/>Conventions for All GDP Documentation</h3></div></div><div class="sect3"><a name="xmlcomp"/><div class="titlepage"><div><h4 class="title"><a name="xmlcomp"/> XML compatibility </h4></div></div><p>
All GNOME documentation should conform to XML syntax
requirements, which are stricter than SGML ones -- see
- <a href="#xml">the section called &#x201C;XML and SGML&#x201D;</a> for more informaion.
- </p></div><div class="sect3"><a name="authorsnames"/><div class="titlepage"><div><h4 class="title"><a name="authorsnames"/><span class="title"> Authors' names</span></h4></div></div><p>
+ <a href="#xml" title="XML and SGML">the section called &#x201C;XML and SGML&#x201D;</a> for more informaion.
+ </p></div><div class="sect3"><a name="authorsnames"/><div class="titlepage"><div><h4 class="title"><a name="authorsnames"/> Authors' names</h4></div></div><p>
All GNOME documentation should contain the names of both the
application authors and documentation authors, as well as a
link to the application web page (if it exists) and
information for bug submission -- see templates for an
example.
- </p></div></div><div class="sect2"><a name="conventionsappdocs"/><div class="titlepage"><div><h3 class="title"><a name="conventionsappdocs"/><span class="title">Conventions for Application Documentation</span></h3></div></div><div class="sect3"><a name="applicationversionid"/><div class="titlepage"><div><h4 class="title"><a name="applicationversionid"/><span class="title">Application Version Identification</span></h4></div></div><p>
+ </p></div></div><div class="sect2"><a name="conventionsappdocs"/><div class="titlepage"><div><h3 class="title"><a name="conventionsappdocs"/>Conventions for Application Documentation</h3></div></div><div class="sect3"><a name="applicationversionid"/><div class="titlepage"><div><h4 class="title"><a name="applicationversionid"/>Application Version Identification</h4></div></div><p>
Application documentation should identify the version of the
application for which the documentation is written:
<pre class="programlisting">
@@ -1170,7 +1171,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
&lt;/para&gt;
&lt;/sect1&gt;
</pre>
- </p></div><div class="sect3"><a name="license"/><div class="titlepage"><div><h4 class="title"><a name="license"/><span class="title"> Copyright information </span></h4></div></div><p> Application
+ </p></div><div class="sect3"><a name="license"/><div class="titlepage"><div><h4 class="title"><a name="license"/> Copyright information </h4></div></div><p> Application
documentation should contain a copyright notice, stating the
licensing terms. It is suggested that you use the GNU Free
Documentation License. You could also use some other license
@@ -1178,15 +1179,15 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
license. If documentation uses some trademarks (such as UNIX,
Linux, Windows, etc.), proper legal junk should also be
included (see templates).
- </p></div><div class="sect3"><a name="license2"/><div class="titlepage"><div><h4 class="title"><a name="license2"/><span class="title">Software license</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="license2"/><div class="titlepage"><div><h4 class="title"><a name="license2"/>Software license</h4></div></div><p>
All GNOME applications must contain information about the
license (for software, not for documentation), either in the
&quot;About&quot; box or in the manual.
- </p></div><div class="sect3"><a name="bugtraq"/><div class="titlepage"><div><h4 class="title"><a name="bugtraq"/><span class="title"> Bug reporting</span></h4></div></div><p>
+ </p></div><div class="sect3"><a name="bugtraq"/><div class="titlepage"><div><h4 class="title"><a name="bugtraq"/> Bug reporting</h4></div></div><p>
Application documentation should give an address for
reporting bugs and for submitting comments about the
documentaion (see templates for an example).
- </p></div></div></div><div class="sect1"><a name="writingapplicationmanuals"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="writingapplicationmanuals"/><span class="title">Writing Application and Applet Manuals</span></h2></div></div><p>
+ </p></div></div></div><div class="sect1"><a name="writingapplicationmanuals"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="writingapplicationmanuals"/>Writing Application and Applet Manuals</h2></div></div><p>
Every GNOME application or applet should have a manual specific
to that particular application. This manual should be a complete
and authoritative guide. The manual should describe what the
@@ -1194,25 +1195,25 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
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="id2881160">Documentation Availability</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2894411"/>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
applet and be made available to the user through the standard
GNOME help system methods described below.
</p></div><p> Application manuals should be based on the template in
- <a href="#template1">the section called &#x201C;Template 1: Application Manual&#x201D;</a>. Applet manuals should be based on
- the templates in <a href="#template2-1x">the section called &#x201C;Template 2: Applet Manual For GNOME 1.x&#x201D;</a> for GNOME
- versions 1.x and the templates in <a href="#template2-2x">the section called &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</a>
+ <a href="#template1" title="Template 1: Application Manual">the section called &#x201C;Template 1: Application Manual&#x201D;</a>. Applet manuals should be based on
+ the templates in <a href="#template2-1x" title="Template 2: Applet Manual For GNOME 1.x">the section called &#x201C;Template 2: Applet Manual For GNOME 1.x&#x201D;</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 &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</a>
for GNOME versions 2.x.
- </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2881200">Manuals For Large Applications</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2894451"/>Manuals For Large Applications</h3><p>
Manuals for very large applications, such as GNOME Workshop
components should be a <tt>&lt;book&gt;</tt> (and thus
use <tt>&lt;chapter&gt;</tt> for each primary section)
, instead of <tt>&lt;article&gt;</tt> which most
applications use(with each primary section being a
<tt>&lt;sect1&gt;</tt>).
- </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2881315">Applet Manuals in GNOME 2.0</a></h3><p>
+ </p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2894566"/>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
@@ -1225,10 +1226,10 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
Application manuals should be made available by having a
&quot;Manual&quot; entry in the Help pull-down menu
at the top of the
- application, as described in <a href="#listingdocsinhelpmenu">the section called &#x201C;Listing Documents in the Help Menu&#x201D;</a>.
+ application, as described in <a href="#listingdocsinhelpmenu" title="Listing Documents in the Help Menu">the section called &#x201C;Listing Documents in the Help Menu&#x201D;</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: all"><a name="listingdocsinhelpmenu"/><span class="title">Listing Documents in the Help Menu</span></h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2881433">Developer Information</a></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="id2894684"/>Developer Information</h3><p>
This section is for developers. Documentation authors
generally do not need to know this material.
</p></div><p>
@@ -1260,7 +1261,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="id2881577">Note</a></h3><p>
+ </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2894828"/>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 +1287,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: all"><a name="applicationhelpbuttons"/><span class="title">Application Help Buttons</span></h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2881714">Developer Information</a></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="id2894965"/>Developer Information</h3><p>
This section is for developers. Documentation authors
generally do not need to know this material.
</p></div><p>
@@ -1311,10 +1312,10 @@ 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="id2881820">NOTE</a></h3><p>
+ </pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2895071"/>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: all"><a name="packagingappletdocs"/><span class="title">Packaging Applet Documentation</span></h2></div></div><div class="sect2"><a name="appletfiles"/><div class="titlepage"><div><h3 class="title"><a name="appletfiles"/><span class="title">Applet Documentation Files</span></h3></div></div><p>
+ </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>
In GNOME 2.0 each applet will have its own documentation
installed separately, and the GNOME 2.0 help
browser (Nautilus) will dynamically
@@ -1348,7 +1349,7 @@ if (tmp) {
of the <i>GNOME Applets</i> book, you must
remember to add <tt>&lt;legalnotice&gt;</tt> and
<tt>&lt;copyright&gt;</tt> sections.
- </p></div><div class="sect2"><a name="appletmenu"/><div class="titlepage"><div><h3 class="title"><a name="appletmenu"/><span class="title">Adding Documentation to an Applet Menu</span></h3></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2882062">Developer Information</a></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="id2895313"/>Developer Information</h3><p>
This section is for developers. Documentation authors
generally do not need to know this material.
</p></div><p>
@@ -1372,7 +1373,7 @@ _(&quot;Manual&quot;), &amp;open_manual, NULL);
You will need to write a simple callback function to open the
help browser to the appropriate document. This is done using
the <tt>gnome_help_file_find_file</tt> function,
- as described in <a href="#applicationhelpbuttons">the section called &#x201C;Application Help Buttons&#x201D;</a>.
+ as described in <a href="#applicationhelpbuttons" title="Application Help Buttons">the section called &#x201C;Application Help Buttons&#x201D;</a>.
</p><p>
You will also want to add an About menu
item to the applet's menu. This is a
@@ -1385,7 +1386,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</p><p>
More information can be found at <a href="http://developer.gnome.org/doc/tutorials/applet/index.html" target="_top">Writing
GNOME panel applets using the GTK+/GTK-- widget set</a>.
- </p></div></div><div class="sect1"><a name="writingcontextsensitivehelp"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="writingcontextsensitivehelp"/><span class="title">Writing Context Sensitive Help (coming in GNOME-2.0)</span></h2></div></div><p>
+ </p></div></div><div class="sect1"><a name="writingcontextsensitivehelp"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="writingcontextsensitivehelp"/>Writing Context Sensitive Help (coming in GNOME-2.0)</h2></div></div><p>
Context sensitive help, also known as &quot;pop-up&quot; help, will allow
a user to obtain help information about specific buttons or
parts of an application.
@@ -1414,12 +1415,12 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
item and selecting a pop-up menu item like &quot;What's This&quot;) a
small transient window will appear with brief but detailed
information on the interface item.
- </p></div><div class="sect1"><a name="referring"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="referring"/><span class="title">Referring to Other GNOME Documentation (coming in
- GNOME-2.0)</span></h2></div></div><p>
+ </p></div><div class="sect1"><a name="referring"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="referring"/>Referring to Other GNOME Documentation (coming in
+ GNOME-2.0)</h2></div></div><p>
In the GNOME 2.0 Help System, you will be able to create links
from one document to another. The exact mechanism for doing
this is in development.
- </p></div><div class="sect1"><a name="basics"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="basics"/><span class="title">Basics of Documentation Style</span></h2></div></div><p>
+ </p></div><div class="sect1"><a name="basics"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="basics"/>Basics of Documentation Style</h2></div></div><p>
Most people have never enjoyed reading a software manual, and
they probably never will. Many times, they'll read the
documentation only when they run into problems, and they'll be
@@ -1439,7 +1440,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
also help if you focus on the tasks users will perform, and
group features accordingly, rather than simply describing
features at random.
- </p><div class="sect2"><a name="styleplanning"/><div class="titlepage"><div><h3 class="title"><a name="styleplanning"/><span class="title">Planning</span></h3></div></div><p>
+ </p><div class="sect2"><a name="styleplanning"/><div class="titlepage"><div><h3 class="title"><a name="styleplanning"/>Planning</h3></div></div><p>
Begin documenting by learning how to use the application and
reading over any existing documentation. Pay attention to
places where your document will differ from the template. It
@@ -1450,10 +1451,10 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
<tt>&lt;book&gt;</tt> tag instead of
<tt>&lt;chapter&gt;</tt> or
<tt>&lt;article&gt;</tt>.
- </p></div><div class="sect2"><a name="balance"/><div class="titlepage"><div><h3 class="title"><a name="balance"/><span class="title">Achieving a Balanced Style</span></h3></div></div><p>
+ </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="id2882582"/>
+ <div class="itemizedlist"><ul><li><p><a name="id2895833"/>
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 +1464,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
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="id2882609"/>
+ </p></li><li><p><a name="id2895860"/>
Be engaging and friendly, yet professional. Games
documents may be less formal than productivity
application documents (people don't
@@ -1472,14 +1473,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
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="id2882649"/>
+ </p></li><li><p><a name="id2895900"/>
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="id2882672"/>
+ </p></li><li><p><a name="id2895924"/>
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
@@ -1488,7 +1489,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
individual needs of your subject, or your own
individuality as a writer.
</p></li></ul></div>
- </p></div><div class="sect2"><a name="stylestructure"/><div class="titlepage"><div><h3 class="title"><a name="stylestructure"/><span class="title">Structure</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="stylestructure"/><div class="titlepage"><div><h3 class="title"><a name="stylestructure"/>Structure</h3></div></div><p>
In general, you won't have to worry too much about structure,
because the templates provide you with an excellent example.
As a general rule, try to follow that structural example.
@@ -1514,7 +1515,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
will contain a glossary in its next versions; unless you're
writing a<tt>&lt;book&gt;</tt>, it will probably be best to
contribute to that rather than developing your own.
- </p></div><div class="sect2"><a name="stylegrammar"/><div class="titlepage"><div><h3 class="title"><a name="stylegrammar"/><span class="title">Grammar and Spelling</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="stylegrammar"/><div class="titlepage"><div><h3 class="title"><a name="stylegrammar"/>Grammar and Spelling</h3></div></div><p>
Nobody expects you to be perfect; they just expect the
documentation for their software to be error-free. That means
that, in the same way that developers look for bugs and accept
@@ -1534,7 +1535,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
familiarize yourself with documentation, and it certainly
makes you valuable to the GDP. Help other writers proof their
documents, and they will help you with yours.
- </p></div></div><div class="sect1"><a name="teamwork"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="teamwork"/><span class="title">Teamwork</span></h2></div></div><div class="sect2"><a name="teamworkgdp"/><div class="titlepage"><div><h3 class="title"><a name="teamworkgdp"/><span class="title">Working With The GDP Team</span></h3></div></div><p>
+ </p></div></div><div class="sect1"><a name="teamwork"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="teamwork"/>Teamwork</h2></div></div><div class="sect2"><a name="teamworkgdp"/><div class="titlepage"><div><h3 class="title"><a name="teamworkgdp"/>Working With The GDP Team</h3></div></div><p>
The GDP team is a valuable resource for any documentation
author. GDP members can answer most questions documentation
authors have during the course of their work. It is also
@@ -1555,7 +1556,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
another author to do this by either asking on the #docs IRC
channel at irc.gnome.org or by emailing the <a href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list/" target="_top">
<i>gnome-doc-list mailing list</i></a>.
- </p></div><div class="sect2"><a name="teamworkdevelopers"/><div class="titlepage"><div><h3 class="title"><a name="teamworkdevelopers"/><span class="title">Working With Developers</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="teamworkdevelopers"/><div class="titlepage"><div><h3 class="title"><a name="teamworkdevelopers"/>Working With Developers</h3></div></div><p>
Writing documentation typically involves a certain amount of
interaction with the developers of GNOME or the application
which is being documented. Often a document author will need
@@ -1565,12 +1566,12 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
is technically correct. The documentation author should also
make sure that the application author correctly binds and
packages the documentation with the application.
- </p></div></div><div class="sect1"><a name="finishing"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="finishing"/><span class="title">Finishing A Document</span></h2></div></div><div class="sect2"><a name="editting"/><div class="titlepage"><div><h3 class="title"><a name="editting"/><span class="title">Editing The Document</span></h3></div></div><p>
+ </p></div></div><div class="sect1"><a name="finishing"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="finishing"/>Finishing A Document</h2></div></div><div class="sect2"><a name="editting"/><div class="titlepage"><div><h3 class="title"><a name="editting"/>Editing The Document</h3></div></div><p>
When the document is finished, the document should be edited
by another member of the GDP for spelling, clarity, and
DocBook markup. It should also be read by an application
author to make sure the document is technically accurate.
- </p></div><div class="sect2"><a name="submitting"/><div class="titlepage"><div><h3 class="title"><a name="submitting"/><span class="title">Submitting The Document</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="submitting"/><div class="titlepage"><div><h3 class="title"><a name="submitting"/>Submitting The Document</h3></div></div><p>
After the document has been edited and checked for technical
accuracy, it is ready to be combined with the application or
documentation package. This is typically done by passing the
@@ -1587,7 +1588,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
The final step is to email the GNOME Translation Team at
<tt>&lt;<a href="mailto:gnome-i18n@nuclecu.unam.mx">gnome-i18n@nuclecu.unam.mx</a>&gt;</tt> to notify them that
there is a new document for them to translate.
- </p></div></div><div class="sect1"><a name="resources"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="resources"/><span class="title">Resources</span></h2></div></div><div class="sect2"><a name="resourcesweb"/><div class="titlepage"><div><h3 class="title"><a name="resourcesweb"/><span class="title">Resources On The Web</span></h3></div></div><p> The <a href="http://developer.gnome.org/projects/gdp/" target="_top">GNOME
+ </p></div></div><div class="sect1"><a name="resources"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="resources"/>Resources</h2></div></div><div class="sect2"><a name="resourcesweb"/><div class="titlepage"><div><h3 class="title"><a name="resourcesweb"/>Resources On The Web</h3></div></div><p> The <a href="http://developer.gnome.org/projects/gdp/" target="_top">GNOME
Documentation Project Web page</a> lists current GDP
projects and members.
</p><p>
@@ -1597,25 +1598,25 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
Norman Walsh's <a href="http://www.docbook.org" target="_top"> <i>DocBook: The Definitive
Guide</i></a> in an excellent book on DocBook,
available both online and in print.
- </p></div><div class="sect2"><a name="resourcesbooks"/><div class="titlepage"><div><h3 class="title"><a name="resourcesbooks"/><span class="title">Books</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="resourcesbooks"/><div class="titlepage"><div><h3 class="title"><a name="resourcesbooks"/>Books</h3></div></div><p>
Docbook: The Definitive Guide is available in both printed
form and on the web at:
<a href="http://www.docbook.org/tdg/index.html" target="_top">
<i>Docbook: The Definitive Guide</i>
</a>
- </p></div><div class="sect2"><a name="mailinglists"/><div class="titlepage"><div><h3 class="title"><a name="mailinglists"/><span class="title">Mailing Lists</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="mailinglists"/><div class="titlepage"><div><h3 class="title"><a name="mailinglists"/>Mailing Lists</h3></div></div><p>
The <i>gnome-docs-list</i> mailing list is the
main discussion area for all contributors to the GNOME
Documentation Project. You can find out how to subscribe to
this list on <a href="http://www.gnome.org/resources/mailing-lists.html" target="_top">GNOME Mailing Lists</a>. This is a rather
low-volume list, so you will not be flooded with messages.
- </p></div><div class="sect2"><a name="irc"/><div class="titlepage"><div><h3 class="title"><a name="irc"/><span class="title">IRC</span></h3></div></div><p>
+ </p></div><div class="sect2"><a name="irc"/><div class="titlepage"><div><h3 class="title"><a name="irc"/>IRC</h3></div></div><p>
Internet Relay Chat (IRC) is a fast and easy way to get in
touch with other GDP members. There are generally at least a
few members here who can answer questions or discuss
documentation issues. The IRC channel is #docs at
irc.gnome.org.
- </p></div></div><div id="templates" class="appendix"><h2 class="title" style="clear: all"><a name="templates"/>Appendix A. Document Templates</h2><div class="sect1"><a name="template1"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="template1"/><span class="title">Template 1: Application Manual</span></h2></div></div><p>
+ </p></div></div><div class="appendix"><h2 class="title" style="clear: both"><a name="templates"/>A. Document Templates</h2><div class="sect1"><a name="template1"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="template1"/>Template 1: Application Manual</h2></div></div><p>
The following template should be used for all application
manuals. You can always get the latest copy of this
template from <a href="http://developer.gnome.org/projects/gdp/templates.html" target="_top">GDP
@@ -2351,7 +2352,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</pre>
- </p></div><div class="sect1"><a name="template2-1x"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="template2-1x"/><span class="title">Template 2: Applet Manual For GNOME 1.x</span></h2></div></div><p>
+ </p></div><div class="sect1"><a name="template2-1x"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="template2-1x"/>Template 2: Applet Manual For GNOME 1.x</h2></div></div><p>
The following templates should be used for all applet
manuals in GNOME 1.x releases. You can always get the latest
copy of these templates from <a href="http://developer.gnome.org/projects/gdp/templates.html" target="_top">GDP
@@ -2673,7 +2674,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
</pre>
- </p></div><div class="sect1"><a name="template2-2x"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="template2-2x"/><span class="title">Template 2: Applet Manual For GNOME 2.x</span></h2></div></div><p>
+ </p></div><div class="sect1"><a name="template2-2x"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="template2-2x"/>Template 2: Applet Manual For GNOME 2.x</h2></div></div><p>
The following templates should be used for all applet
manuals in GNOME 2.x releases. You can always get the latest
copy of these templates from <a href="http://developer.gnome.org/projects/gdp/templates.html" target="_top">GDP
diff --git a/tests/docbook/result/xhtml/graphics.xhtml b/tests/docbook/result/xhtml/graphics.xhtml
index 5592f64d..ae068ad4 100644
--- a/tests/docbook/result/xhtml/graphics.xhtml
+++ b/tests/docbook/result/xhtml/graphics.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Graphics Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2760599" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2760599"/>Graphics Test Document Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2760609">Graphic</a></dt><dt> <a href="#id2760722">Inlinegraphic</a></dt><dt> <a href="#id2760797">MediaObject</a></dt></dl></div><div class="section"><a name="id2760609"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2760609"/><span class="title">Graphic</span></h2></div></div><p>fileref:</p><p><img src="emc2.png"/></p><p>entityref:</p><p><img src=""/></p><p>fileref, scale=200:</p><p><img src="emc2.png" width="200%"/></p><p>fileref, width=20, depth=20</p><p><img src="emc2.png" height="20" width="20"/></p></div><div class="section"><a name="id2760722"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2760722"/><span class="title">Inlinegraphic</span></h2></div></div><p>fileref: <img src="emc2.png"/></p><p>entityref: <img src=""/></p><p>fileref, scale=200: <img src="emc2.png" width="200%"/></p></div><div class="section"><a name="id2760797"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2760797"/><span class="title">MediaObject</span></h2></div></div><p>fileref:</p><div class="mediaobject"><img src="emc2.png"/></div><p>entityref:</p><div class="mediaobject"><img src=""/></div><p>fileref, scale=20:</p><div class="mediaobject"><img src="emc2.png" width="20%"/></div><p>fileref, width=200, depth=400:</p><div class="mediaobject"><img src="emc2.png" height="400" width="200"/></div><p>fileref, width=20, depth=20, alt=Alt text:</p><div class="mediaobject"><img src="emc2.png" height="20" width="20" alt="Alt text"/></div></div></div></body></html>
+<html><head><title>Graphics Test Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2773851"/>Graphics Test Document Title</h2></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2773861">Graphic</a></dt><dt> <a href="#id2773981">Inlinegraphic</a></dt><dt> <a href="#id2774060">MediaObject</a></dt></dl></div><div class="section"><a name="id2773861"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2773861"/>Graphic</h2></div></div><p>fileref:</p><p><img src="emc2.png"/></p><p>entityref:</p><p><img src=""/></p><p>fileref, scale=200:</p><p><img src="emc2.png" width="200%"/></p><p>fileref, width=20, depth=20</p><p><img src="emc2.png" height="20" width="20"/></p></div><div class="section"><a name="id2773981"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2773981"/>Inlinegraphic</h2></div></div><p>fileref: <img src="emc2.png"/></p><p>entityref: <img src=""/></p><p>fileref, scale=200: <img src="emc2.png" width="200%"/></p></div><div class="section"><a name="id2774060"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2774060"/>MediaObject</h2></div></div><p>fileref:</p><div class="mediaobject"><img src="emc2.png"/></div><p>entityref:</p><div class="mediaobject"><img src=""/></div><p>fileref, scale=20:</p><div class="mediaobject"><img src="emc2.png" width="20%"/></div><p>fileref, width=200, depth=400:</p><div class="mediaobject"><img src="emc2.png" height="400" width="200"/></div><p>fileref, width=20, depth=20, alt=Alt text:</p><div class="mediaobject"><img src="emc2.png" height="20" width="20" alt="Alt text"/></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/gtest.xhtml b/tests/docbook/result/xhtml/gtest.xhtml
index d3465f70..0b2a1922 100644
--- a/tests/docbook/result/xhtml/gtest.xhtml
+++ b/tests/docbook/result/xhtml/gtest.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Chapter 1. Graphics Test</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2599673" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2599673"/>Chapter 1. Graphics Test</h2></div></div><p>A graphic by fileref:</p><div class="mediaobject"><img src="emc2.gif"/></div><p>A graphic by entityref:</p><div class="mediaobject"><img src=""/></div></div></body></html>
+<html><head><title>Chapter 1. Graphics Test</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2763827"/>Chapter 1. Graphics Test</h2></div></div><p>A graphic by fileref:</p><div class="mediaobject"><img src="emc2.gif"/></div><p>A graphic by entityref:</p><div class="mediaobject"><img src=""/></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/idxbook.xhtml b/tests/docbook/result/xhtml/idxbook.xhtml
index 437511b0..b152b35f 100644
--- a/tests/docbook/result/xhtml/idxbook.xhtml
+++ b/tests/docbook/result/xhtml/idxbook.xhtml
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Test Index Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751380"><div class="titlepage"><div><h1 class="title"><a name="id2751380"/>Book Test Index Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2758372">Foreword</a></dt><dt>1. <a href="#chapter">First Chapter</a></dt><dd><dl><dt> <a href="#id2753898">First Sect1</a></dt></dl></dd><dt>2. <a href="#ch2">Second Chapter</a></dt><dt>A. <a href="#id2755945">First Appendix</a></dt><dt><a href="#id2754212">Index</a></dt></dl></div><div id="id2758372" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2758372"/>Foreword</h2></div></div><p>This is a test paragraph<a class="indexterm" name="id2758390"/>.</p></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. First Chapter</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2753898">First Sect1</a></dt></dl></div><p>Paragraph<a class="indexterm" name="id2753884"/>.</p><div class="sect1"><a name="id2753898"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2753898"/><span class="title">First Sect1</span></h2></div></div><p>Another paragraph<a class="indexterm" name="id2753916"/>.</p></div></div><div id="ch2" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch2"/>Chapter 2. Second Chapter</h2></div></div><p>This is a test paragraph.
-<a class="indexterm" name="id2874838"/>
-<a class="indexterm" name="id2874865"/>
-<a class="indexterm" name="id2874843"/>
+<html><head><title>Book Test Index Document Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770802"><div class="titlepage"><div><h1 class="title"><a name="id2770802"/>Bookinfo Test Index Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2770984">Foreword</a></dt><dt>1 <a href="#chapter">First Chapter</a></dt><dd><dl><dt> <a href="#id2769217">First Sect1</a></dt></dl></dd><dt>2 <a href="#ch2">Second Chapter</a></dt><dt>A <a href="#id2861877">First Appendix</a></dt><dt><a href="#id2767250">Index</a></dt></dl></div><div id="id2770984" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2770984"/>Foreword</h2></div></div><p>This is a test paragraph<a class="indexterm" name="id2771002"/>.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. First Chapter</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2769217">First Sect1</a></dt></dl></div><p>Paragraph<a class="indexterm" name="id2769202"/>.</p><div class="sect1"><a name="id2769217"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2769217"/>First Sect1</h2></div></div><p>Another paragraph<a class="indexterm" name="id2769234"/>.</p></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch2"/>Chapter 2. Second Chapter</h2></div></div><p>This is a test paragraph.
+<a class="indexterm" name="id2769293"/>
+<a class="indexterm" name="id2769314"/>
+<a class="indexterm" name="id2769342"/>
-<a class="indexterm" name="id2848609"/>
-<a class="indexterm" name="id2848632"/>
+<a class="indexterm" name="id2769358"/>
+<a class="indexterm" name="id2769382"/>
-<a class="indexterm" name="id2848648"/>
+<a class="indexterm" name="id2769397"/>
-<a class="indexterm" name="id2755835"/>
-<a class="indexterm" name="id2755851"/>
+<a class="indexterm" name="id2861955"/>
+<a class="indexterm" name="id2861971"/>
-<a class="indexterm" name="id2755882"/>
-<a class="indexterm" name="id2755905"/>
-<a class="indexterm" name="id2755929"/></p></div><div id="id2755945" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2755945"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.
-<a class="indexterm" name="id2755963"/>
-<a class="indexterm" name="id2755979"/>
+<a class="indexterm" name="id2888108"/>
+<a class="indexterm" name="id2888132"/>
+<a class="indexterm" name="id2861860"/></p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2861877"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.
+<a class="indexterm" name="id2861894"/>
+<a class="indexterm" name="id2861909"/>
-<a class="indexterm" name="id2755994"/>
-<a class="indexterm" name="id2756018"/>
+<a class="indexterm" name="id2767042"/>
+<a class="indexterm" name="id2767066"/>
-<a class="indexterm" name="id2756034"/>
-<a class="indexterm" name="id2756065"/>
+<a class="indexterm" name="id2767082"/>
+<a class="indexterm" name="id2767113"/>
-<a class="indexterm" name="id2756081"/>
-<a class="indexterm" name="id2756104"/>
-<a class="indexterm" name="id2756128"/>
+<a class="indexterm" name="id2767129"/>
+<a class="indexterm" name="id2767153"/>
+<a class="indexterm" name="id2767176"/>
-<a class="indexterm" name="id2754153"/>
-<a class="indexterm" name="id2754168"/>
-<a class="indexterm" name="id2754184"/>
-</p></div><div class="index"><h2 class="title"><a name="id2754212">Index</a></h2><div class="index"><div class="indexdiv"><h3>Symbols</h3><dl><dt>1 digit test, <a href="#id2755945">First Appendix</a></dt><dt>2 digit test, <a href="#id2755945">First Appendix</a></dt><dt>[square bracket test], <a href="#id2755945">First Appendix</a></dt></dl></div><div class="indexdiv"><h3>A</h3><dl><dt>the ap1, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt><dd><dl><dt>see also ap2</dt></dl></dd><dt>ap2, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></div><div class="indexdiv"><h3>B</h3><dl><dt>bp1</dt><dd><dl><dt>bp1bs1, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></dd><dt>bp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></div><div class="indexdiv"><h3>C</h3><dl><dt>chapter zone, <a href="#chapter">First Chapter</a>, <a href="#ch2">Second Chapter</a></dt><dt>cp1</dt><dd><dl><dt>cp1cs1</dt><dd><dl><dt>cp1cs1ct1, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></dd></dl></dd><dt>cp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt><dt>cp2see</dt><dd><dl><dt>cp2seesec</dt><dd><dl><dt>cp2</dt></dl></dd></dl></dd></dl></div><div class="indexdiv"><h3>D</h3><dl><dt>dp1</dt><dd><dl><dt>dp1ds1, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt><dt>dp1ds2, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></dd><dt>dp2, <a href="#ch2">Second Chapter</a>, <a href="#id2755945">First Appendix</a></dt></dl></div><div class="indexdiv"><h3>P</h3><dl><dt>paragraph, <a href="#chapter">First Chapter</a></dt><dd><dl><dt>another, <a href="#id2753898">First Sect1</a></dt><dt>test, <a href="#id2758372">Foreword</a></dt></dl></dd></dl></div></div></div></div></body></html>
+<a class="indexterm" name="id2767192"/>
+<a class="indexterm" name="id2767208"/>
+<a class="indexterm" name="id2767224"/>
+</p></div><div id="id2767250" class="index"><div class="titlepage"><div><h2 class="title"><a name="id2767250"/>Index</h2></div></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/kwrite.xhtml b/tests/docbook/result/xhtml/kwrite.xhtml
index 12b96a27..59bf581b 100644
--- a/tests/docbook/result/xhtml/kwrite.xhtml
+++ b/tests/docbook/result/xhtml/kwrite.xhtml
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>the kwrite handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/><meta name="keywords" content="kde, kwrite, text, editor"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751437"><div class="titlepage"><div><h1 class="title"><a name="id2751437"/>the kwrite handbook</h1></div><div><h3 class="author">thad mcginnis</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></pre></div><h3 class="othercredit">jochen wilhelmy</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></pre></div><h3 class="othercredit">glen parker</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></pre></div><h3 class="othercredit">michael koch</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></pre></div><h3 class="othercredit">christian tibirna</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></pre></div><h3 class="othercredit">lauri watts</h3><div class="affiliation"><pre class="address"><tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></pre></div></div><div><span class="releaseinfo">2.00.00<br/></span></div><div><p class="copyright">Copyright © 2000, 2001 by thad mcginnis</p></div><div><div class="legalnotice"><p>permission is granted to copy, distribute and/or modify this
+<html><head><title>the kwrite handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/><meta name="keywords" content="kde, kwrite, text, editor"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2861855"><div class="titlepage"><div><h1 class="title"><a name="id2861855"/>the kwrite handbook</h1></div><div><h3 class="author">thad mcginnis</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></div></div><h3 class="othercredit">jochen wilhelmy</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></div></div><h3 class="othercredit">glen parker</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></div></div><h3 class="othercredit">michael koch</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></div></div><h3 class="othercredit">christian tibirna</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></div></div><h3 class="othercredit">lauri watts</h3><div class="affiliation"><div class="address"><tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></div></div></div><div><p class="releaseinfo">2.00.00</p></div><div><p class="copyright">Copyright © 2000, 2001 thad mcginnis</p></div><div><div class="legalnotice"><p>permission is granted to copy, distribute and/or modify this
document under the terms of the gnu free documentation license,
version 1.1 or any later version published by the free software
foundation; with no invariant sections, with no front-cover texts, and
-with no back-cover texts. a copy of the license is included in <a href="#gnu-fdl">the section entitled gnu free documentation license</a>.</p></div></div><div><div class="abstract"><p><a name="id2756174"/><b>Abstract</b></p><p>this handbook describes kwrite version 2.0</p><p>kwrite is a text editor for kde 2.0</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#introduction">introduction</a></dt><dt>2. <a href="#on-screen-fundamentals">some fundamentals</a></dt><dd><dl><dt> <a href="#drag-and-drop">drag and drop</a></dt><dt> <a href="#command-line-options">command line options</a></dt><dd><dl><dt> <a href="#specify-a-file">specify a file</a></dt><dt> <a href="#editing-files-on-the-internet">specify a file on the internet</a></dt><dt> <a href="#other-command-line-options">other command line options</a></dt></dl></dd><dt> <a href="#keybindings">key bindings</a></dt></dl></dd><dt>3. <a href="#the-menu-entries">the menu entries</a></dt><dd><dl><dt> <a href="#file">the file menu</a></dt><dt> <a href="#edit">the edit menu</a></dt><dt> <a href="#go">the go menu</a></dt><dt> <a href="#tools">the tools menu</a></dt><dt> <a href="#settings">the settings menu</a></dt><dt> <a href="#help">the help menu</a></dt></dl></dd><dt>4. <a href="#pref-dialog">configure kwrite</a></dt><dd><dl><dt> <a href="#prefcolors">colors</a></dt><dt> <a href="#pref-indent">indent</a></dt><dt> <a href="#pref-select">select</a></dt><dt> <a href="#pref-edit">edit</a></dt><dt> <a href="#prefspellchecker">spelling</a></dt></dl></dd><dt>5. <a href="#pref-highlighting">highlighting</a></dt><dt>6. <a href="#credits">credits and licenses</a></dt><dt>A. <a href="#installation">installation</a></dt></dl></div><div id="introduction" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="introduction"/>Chapter 1. introduction</h2></div></div><p>kwrite is more than a text editor for the kde desktop. it is meant
+with no back-cover texts. a copy of the license is included in <a href="#gnu-fdl">the section entitled gnu free documentation license</a>.</p></div></div><div><div class="abstract"><p><a name="id2770969"/><b>Abstract</b></p><p>this handbook describes kwrite version 2.0</p><p>kwrite is a text editor for kde 2.0</p></div></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#introduction">introduction</a></dt><dt>2 <a href="#on-screen-fundamentals">some fundamentals</a></dt><dd><dl><dt> <a href="#drag-and-drop">drag and drop</a></dt><dt> <a href="#command-line-options">command line options</a></dt><dd><dl><dt> <a href="#specify-a-file">specify a file</a></dt><dt> <a href="#editing-files-on-the-internet">specify a file on the internet</a></dt><dt> <a href="#other-command-line-options">other command line options</a></dt></dl></dd><dt> <a href="#keybindings">key bindings</a></dt></dl></dd><dt>3 <a href="#the-menu-entries">the menu entries</a></dt><dd><dl><dt> <a href="#file">the file menu</a></dt><dt> <a href="#edit">the edit menu</a></dt><dt> <a href="#go">the go menu</a></dt><dt> <a href="#tools">the tools menu</a></dt><dt> <a href="#settings">the settings menu</a></dt><dt> <a href="#help">the help menu</a></dt></dl></dd><dt>4 <a href="#pref-dialog">configure kwrite</a></dt><dd><dl><dt> <a href="#prefcolors">colors</a></dt><dt> <a href="#pref-indent">indent</a></dt><dt> <a href="#pref-select">select</a></dt><dt> <a href="#pref-edit">edit</a></dt><dt> <a href="#prefspellchecker">spelling</a></dt></dl></dd><dt>5 <a href="#pref-highlighting">highlighting</a></dt><dt>6 <a href="#credits">credits and licenses</a></dt><dt>A <a href="#installation">installation</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="introduction"/>Chapter 1. introduction</h2></div></div><p>kwrite is more than a text editor for the kde desktop. it is meant
to be a programmer's editor, and could be considered as at least a partial
alternative to more powerful editors. it may be best used in conjunction
with konqueror for source file browsing for
different languages. kwrite also works very well as a simple text editor.
one of kwrite's main features is the colorized syntax, customized for
-many different programming languages such as: c/c++, java, python, perl,
-bash, modula 2, html, and ada.</p></div><div id="on-screen-fundamentals" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="on-screen-fundamentals"/>Chapter 2. some fundamentals</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#drag-and-drop">drag and drop</a></dt><dt> <a href="#command-line-options">command line options</a></dt><dd><dl><dt> <a href="#specify-a-file">specify a file</a></dt><dt> <a href="#editing-files-on-the-internet">specify a file on the internet</a></dt><dt> <a href="#other-command-line-options">other command line options</a></dt></dl></dd><dt> <a href="#keybindings">key bindings</a></dt></dl></div><p>kwrite is very simple to use. anyone that has used a text editor should
-have no problems. </p><div class="sect1"><a name="drag-and-drop"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="drag-and-drop"/><span class="title">drag and drop</span></h2></div></div><p>kwrite uses the kde drag and drop protocol. files may be dragged
+many different programming languages such as: c/c++, java&#x2122;, python, perl,
+bash, modula 2, html, and ada.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="on-screen-fundamentals"/>Chapter 2. some fundamentals</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#drag-and-drop">drag and drop</a></dt><dt> <a href="#command-line-options">command line options</a></dt><dd><dl><dt> <a href="#specify-a-file">specify a file</a></dt><dt> <a href="#editing-files-on-the-internet">specify a file on the internet</a></dt><dt> <a href="#other-command-line-options">other command line options</a></dt></dl></dd><dt> <a href="#keybindings">key bindings</a></dt></dl></div><p>kwrite is very simple to use. anyone that has used a text editor should
+have no problems. </p><div class="sect1"><a name="drag-and-drop"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="drag-and-drop"/>drag and drop</h2></div></div><p>kwrite uses the kde drag and drop protocol. files may be dragged
and dropped onto kwrite from the desktop,
konqueror or some remote ftp site opened in one
-of konqueror's windows. </p></div><div class="sect1"><a name="command-line-options"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="command-line-options"/><span class="title">command line options</span></h2></div></div><p>though kwrite may most often be started from the kde program menu,
+of konqueror's windows. </p></div><div class="sect1"><a name="command-line-options"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="command-line-options"/>command line options</h2></div></div><p>though kwrite may most often be started from the kde program menu,
or a desktop icon, it can also be opened at the command line prompt of a
terminal window. there are a few useful options that are available when
-doing this.</p><div class="sect2"><a name="specify-a-file"/><div class="titlepage"><div><h3 class="title"><a name="specify-a-file"/><span class="title">specify a file</span></h3></div></div><p>by specifying the path and name of a particular file the user can
+doing this.</p><div class="sect2"><a name="specify-a-file"/><div class="titlepage"><div><h3 class="title"><a name="specify-a-file"/>specify a file</h3></div></div><p>by specifying the path and name of a particular file the user can
have kwrite open (or create) that file immediately upon startup. this
-option might look something like the following:</p><div class="informalexample" id="id2757902"><p/><a name="id2757902"/><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>/home/myhome/docs/myfile.txt</tt></i></tt></tt></b></pre><p/></div></div><div class="sect2"><a name="editing-files-on-the-internet"/><div class="titlepage"><div><h3 class="title"><a name="editing-files-on-the-internet"/><span class="title">specify a file on the internet</span></h3></div></div><p>the above-mentioned method could even be used to open files on the
+option might look something like the following:</p><div class="informalexample" id="id2767604"><a name="id2767604"/><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>/home/myhome/docs/myfile.txt</tt></i></tt></tt></b></pre></div></div><div class="sect2"><a name="editing-files-on-the-internet"/><div class="titlepage"><div><h3 class="title"><a name="editing-files-on-the-internet"/>specify a file on the internet</h3></div></div><p>the above-mentioned method could even be used to open files on the
internet (if the user has an active connection at the time.) an example of
-this might look like the following:</p><div class="informalexample" id="id2757990"><p/><a name="id2757990"/><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>ftp://ftp.kde.org/pub/kde/welcome.msg</tt></i></tt></tt></b></pre><p/></div></div><div class="sect2"><a name="other-command-line-options"/><div class="titlepage"><div><h3 class="title"><a name="other-command-line-options"/><span class="title">other command line options</span></h3></div></div><p>the following command line help options are available</p><div class="variablelist"><dl><dt><a name="id2758079"/><span class="term"><b><tt><b>kwrite</b> <tt>--help</tt></tt></b></span></dt><dd><p><a name="id2758106"/>this lists the most basic options available at the command
-line.</p></dd><dt><a name="id2758122"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-qt</tt></tt></b></span></dt><dd><p><a name="id2756033"/>this lists the options available for changing the way
-kwrite interacts with qt.</p></dd><dt><a name="id2757855"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-kde</tt></tt></b></span></dt><dd><p><a name="id2756268"/>this lists the options available for changing the way
-kwrite interacts with kde.</p></dd><dt><a name="id2756293"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-all</tt></tt></b></span></dt><dd><p><a name="id2756320"/>this lists all of the command line options.</p></dd><dt><a name="id2756337"/><span class="term"><b><tt><b>kwrite</b> <tt>--author</tt></tt></b></span></dt><dd><p><a name="id2752593"/>lists kwrite's authors in the terminal window</p></dd><dt><a name="id2752617"/><span class="term"><b><tt><b>kwrite</b> <tt>--version</tt></tt></b></span></dt><dd><p><a name="id2752644"/>lists version information for qt, kde, and kwrite. also available through <b><tt><b>kwrite</b> <tt>-v</tt></tt></b> </p></dd></dl></div></div></div><div class="sect1"><a name="keybindings"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="keybindings"/><span class="title">key bindings</span></h2></div></div><p>many of the key bindings (shortcuts) are configurable by way of the <a href="#settings">settings</a> menu. by default kwrite honors the
-following key bindings.</p><div class="informaltable" id="id2752769"><p/><a name="id2752769"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td><p>insert</p></td><td><p> toggle between insert and overwrite mode. when in insert mode the
+this might look like the following:</p><div class="informalexample" id="id2767691"><a name="id2767691"/><pre class="screen"><tt>%</tt> <b><tt><b>kwrite</b> <tt><i><tt>ftp://ftp.kde.org/pub/kde/welcome.msg</tt></i></tt></tt></b></pre></div></div><div class="sect2"><a name="other-command-line-options"/><div class="titlepage"><div><h3 class="title"><a name="other-command-line-options"/>other command line options</h3></div></div><p>the following command line help options are available</p><div class="variablelist"><dl><dt><a name="id2767781"/><span class="term"><b><tt><b>kwrite</b> <tt>--help</tt></tt></b></span></dt><dd><p><a name="id2767808"/>this lists the most basic options available at the command
+line.</p></dd><dt><a name="id2767824"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-qt</tt></tt></b></span></dt><dd><p><a name="id2767851"/>this lists the options available for changing the way
+kwrite interacts with qt&#x2122;.</p></dd><dt><a name="id2767885"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-kde</tt></tt></b></span></dt><dd><p><a name="id2767912"/>this lists the options available for changing the way
+kwrite interacts with kde.</p></dd><dt><a name="id2767938"/><span class="term"><b><tt><b>kwrite</b> <tt>--help-all</tt></tt></b></span></dt><dd><p><a name="id2767965"/>this lists all of the command line options.</p></dd><dt><a name="id2767983"/><span class="term"><b><tt><b>kwrite</b> <tt>--author</tt></tt></b></span></dt><dd><p><a name="id2768010"/>lists kwrite's authors in the terminal window</p></dd><dt><a name="id2768035"/><span class="term"><b><tt><b>kwrite</b> <tt>--version</tt></tt></b></span></dt><dd><p><a name="id2768062"/>lists version information for qt&#x2122;, kde, and kwrite. also available through <b><tt><b>kwrite</b> <tt>-v</tt></tt></b> </p></dd></dl></div></div></div><div class="sect1"><a name="keybindings"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="keybindings"/>key bindings</h2></div></div><p>many of the key bindings (shortcuts) are configurable by way of the <a href="#settings" title="the settings menu">settings</a> menu. by default kwrite honors the
+following key bindings.</p><div class="informaltable" id="id2765894"><a name="id2765894"/><table border="1"><colgroup><col/><col/></colgroup><tbody><tr><td><p>insert</p></td><td><p> toggle between insert and overwrite mode. when in insert mode the
editor will add any typed characters to the text while pushing along any data to
the right of the text cursor. overwrite mode causes the entry of each character
to eliminate the character immediately to the right of the text
cursor.</p></td></tr><tr><td><p>left arrow</p></td><td><p>move the cursor one character to the left </p></td></tr><tr><td><p>right arrow</p></td><td><p> move the cursor one character to the right </p></td></tr><tr><td><p>up arrow</p></td><td><p> move the cursor up one line </p></td></tr><tr><td><p>down arrow</p></td><td><p> move the cursor down one line </p></td></tr><tr><td><p>page up</p></td><td><p> move the cursor up one page </p></td></tr><tr><td><p>page down</p></td><td><p>move the cursor down one page </p></td></tr><tr><td><p>backspace</p></td><td><p> delete the character to the left of the cursor </p></td></tr><tr><td><p>home</p></td><td><p> move the cursor to the beginning of the line </p></td></tr><tr><td><p>end</p></td><td><p> move the cursor to the end of the line </p></td></tr><tr><td><p>delete</p></td><td><p>delete the character to the right of the cursor (or any selected
-text)</p></td></tr><tr><td><p>shift-left arrow</p></td><td><p> mark text one character to the left </p></td></tr><tr><td><p>shift-right arrow</p></td><td><p> mark text one character to the right </p></td></tr><tr><td><p>f1</p></td><td><p> help</p></td></tr><tr><td><p>shift-f1</p></td><td><p><a href="#whats-this">what's this?</a></p></td></tr><tr><td><p>ctrl-f</p></td><td><p><a href="#find"> find</a></p></td></tr><tr><td><p>f3</p></td><td><p><a href="#find-again"> find again</a></p></td></tr><tr><td><p>ctrl-c</p></td><td><p> copy the marked text to the clipboard. </p></td></tr><tr><td><p>ctrl-m</p></td><td><p>set a bookmark</p></td></tr><tr><td><p>ctrl-n</p></td><td><p> <a href="#new">new</a> document</p></td></tr><tr><td><p>ctrl-p</p></td><td><p><a href="#print">print</a> </p></td></tr><tr><td><p>ctrl-q</p></td><td><p>quit - close active copy of editor </p></td></tr><tr><td><p>ctrl-r</p></td><td><p><a href="#replace"> replace</a></p></td></tr><tr><td><p>ctrl-s</p></td><td><p>invokes the <a href="#save">save</a> command.</p></td></tr><tr><td><p>ctrl-v</p></td><td><p> paste the clipboard text into line edit. </p></td></tr><tr><td><p>ctrl-x</p></td><td><p>delete the marked text and copy it to the clipboard. </p></td></tr><tr><td><p>ctrl-z</p></td><td><p><a href="#undo">undo</a></p></td></tr><tr><td><p>ctrl-shift-z</p></td><td><p><a href="#redo">redo</a></p></td></tr></tbody></table><p/></div></div></div><div id="the-menu-entries" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="the-menu-entries"/>Chapter 3. the menu entries</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#file">the file menu</a></dt><dt> <a href="#edit">the edit menu</a></dt><dt> <a href="#go">the go menu</a></dt><dt> <a href="#tools">the tools menu</a></dt><dt> <a href="#settings">the settings menu</a></dt><dt> <a href="#help">the help menu</a></dt></dl></div><div class="sect1"><a name="file"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="file"/><span class="title">the file menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2875518"/><span class="term"><a name="new"/>file-&gt;new (<b>ctrl-n</b>)</span></dt><dd><p><a name="id2875603"/>this starts a new document in the editor. if there is a current
-document with unsaved changes the user is given a chance to save it.</p></dd><dt><a name="id2875623"/><span class="term"><a name="open"/>file-&gt;0pen (<b>ctrl-o</b>)</span></dt><dd><p><a name="id2875708"/>this command opens a file. it does this by means of a dialog box
+text)</p></td></tr><tr><td><p>shift-left arrow</p></td><td><p> mark text one character to the left </p></td></tr><tr><td><p>shift-right arrow</p></td><td><p> mark text one character to the right </p></td></tr><tr><td><p>f1</p></td><td><p> help</p></td></tr><tr><td><p>shift-f1</p></td><td><p><a href="#whats-this">what's this?</a></p></td></tr><tr><td><p>ctrl-f</p></td><td><p><a href="#find"> find</a></p></td></tr><tr><td><p>f3</p></td><td><p><a href="#find-again"> find again</a></p></td></tr><tr><td><p>ctrl-c</p></td><td><p> copy the marked text to the clipboard. </p></td></tr><tr><td><p>ctrl-m</p></td><td><p>set a bookmark</p></td></tr><tr><td><p>ctrl-n</p></td><td><p> <a href="#new">new</a> document</p></td></tr><tr><td><p>ctrl-p</p></td><td><p><a href="#print">print</a> </p></td></tr><tr><td><p>ctrl-q</p></td><td><p>quit - close active copy of editor </p></td></tr><tr><td><p>ctrl-r</p></td><td><p><a href="#replace"> replace</a></p></td></tr><tr><td><p>ctrl-s</p></td><td><p>invokes the <a href="#save">save</a> command.</p></td></tr><tr><td><p>ctrl-v</p></td><td><p> paste the clipboard text into line edit. </p></td></tr><tr><td><p>ctrl-x</p></td><td><p>delete the marked text and copy it to the clipboard. </p></td></tr><tr><td><p>ctrl-z</p></td><td><p><a href="#undo">undo</a></p></td></tr><tr><td><p>ctrl-shift-z</p></td><td><p><a href="#redo">redo</a></p></td></tr></tbody></table></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="the-menu-entries"/>Chapter 3. the menu entries</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#file">the file menu</a></dt><dt> <a href="#edit">the edit menu</a></dt><dt> <a href="#go">the go menu</a></dt><dt> <a href="#tools">the tools menu</a></dt><dt> <a href="#settings">the settings menu</a></dt><dt> <a href="#help">the help menu</a></dt></dl></div><div class="sect1"><a name="file"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="file"/>the file menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2888781"/><span class="term"><a name="new"/>file-&gt;new (<b>ctrl-n</b>)</span></dt><dd><p><a name="id2888866"/>this starts a new document in the editor. if there is a current
+document with unsaved changes the user is given a chance to save it.</p></dd><dt><a name="id2888886"/><span class="term"><a name="open"/>file-&gt;0pen (<b>ctrl-o</b>)</span></dt><dd><p><a name="id2888971"/>this command opens a file. it does this by means of a dialog box
which allows the user to navigate the file system. the dialog operates
like a small file manager. clicking on directories displayed in the
central window directs the dialog to enter that directory - displaying its
@@ -53,23 +53,23 @@ directory. the flag button lets the user set a new bookmark at the current direc
or go to one that was previously set.
the last button on the toolbar allows you to create a new
directory, and finally there is dropdown box with a list of some commonly
-frequented directories.</p></dd><dt><a name="id2875778"/><span class="term"><a name="open-recent"/>file-&gt;open
-recent</span></dt><dd><p><a name="id2875834"/>this is a shortcut to open recently saved documents. clicking on
+frequented directories.</p></dd><dt><a name="id2889041"/><span class="term"><a name="open-recent"/>file-&gt;open
+recent</span></dt><dd><p><a name="id2889098"/>this is a shortcut to open recently saved documents. clicking on
this item opens a list to the side of the menu with several of the most recently
saved files. clicking on a specific file will open it in kwrite - if the file
-still resides at the same location. </p></dd><dt><a name="id2875864"/><span class="term"><a name="save"/>file-&gt;save (<b>ctrl-s</b>)</span></dt><dd><p><a name="id2875950"/>this saves the current document. if there has already been a
+still resides at the same location. </p></dd><dt><a name="id2889128"/><span class="term"><a name="save"/>file-&gt;save (<b>ctrl-s</b>)</span></dt><dd><p><a name="id2889213"/>this saves the current document. if there has already been a
save of the document then this will overwrite the previously saved file without
asking for the user's consent. if it is the first save of a new document the
-save as dialog (described below) will be invoked.</p></dd><dt><a name="id2875972"/><span class="term"><a name="save-as"/>file-&gt;save
-as</span></dt><dd><p><a name="id2876029"/>this allows a document to be saved with a new file name. this is
-done by means of the file dialog box described above in the <a href="#open">open</a> section of this help file.</p></dd><dt><a name="id2876069"/><span class="term"><a name="print"/>file-&gt;print (<b>ctrl-p</b>)</span></dt><dd><p><a name="id2876154"/>opens a simple print dialog allowing the user to specify what, where, and how to print</p></dd><dt><a name="id2876174"/><span class="term"><a name="new-window"/>file-&gt;new window</span></dt><dd><p><a name="id2876230"/>this creates a new window, i.e. a new instance of kwrite. in this way the user can easily work
-on more than one file at a time with kwrite.</p></dd><dt><a name="id2876273"/><span class="term"><a name="new-view"/>file-&gt;new view</span></dt><dd><p><a name="id2876330"/>this creates a new view of the current document, i.e., a new instance of
+save as dialog (described below) will be invoked.</p></dd><dt><a name="id2889236"/><span class="term"><a name="save-as"/>file-&gt;save
+as</span></dt><dd><p><a name="id2889292"/>this allows a document to be saved with a new file name. this is
+done by means of the file dialog box described above in the <a href="#open">open</a> section of this help file.</p></dd><dt><a name="id2889332"/><span class="term"><a name="print"/>file-&gt;print (<b>ctrl-p</b>)</span></dt><dd><p><a name="id2889418"/>opens a simple print dialog allowing the user to specify what, where, and how to print</p></dd><dt><a name="id2889437"/><span class="term"><a name="new-window"/>file-&gt;new window</span></dt><dd><p><a name="id2889493"/>this creates a new window, i.e. a new instance of kwrite. in this way the user can easily work
+on more than one file at a time with kwrite.</p></dd><dt><a name="id2889536"/><span class="term"><a name="new-view"/>file-&gt;new view</span></dt><dd><p><a name="id2889593"/>this creates a new view of the current document, i.e., a new instance of
kwrite (as explained in the previous entry) but containing the same
-document.</p></dd><dt><a name="id2876365"/><span class="term"><a name="close"/>file-&gt;quit (<b>ctrl-q</b>)</span></dt><dd><p><a name="id2876451"/>this will close the editor window, if you have more than one
+document.</p></dd><dt><a name="id2889628"/><span class="term"><a name="close"/>file-&gt;quit (<b>ctrl-q</b>)</span></dt><dd><p><a name="id2889714"/>this will close the editor window, if you have more than one
instance of kwrite running, through the new view or
new window menu items, those instances will not be
-closed.</p></dd></dl></div></div><div class="sect1"><a name="edit"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="edit"/><span class="title">the edit menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2876535"/><span class="term"><a name="undo"/>edit-&gt;undo (<b>ctrl-z</b>)</span></dt><dd><p><a name="id2876621"/>this is used to eliminate or reverse the most recent user action or operation. just what
-constitutes such an action may be better understood by referring to the <a href="#group-undos">group undos</a> portion of this help file.</p></dd><dt><a name="id2876662"/><span class="term"><a name="redo"/>edit-&gt;redo (<b>ctrl-shift-z</b>)</span></dt><dd><p><a name="id2876757"/>this will reverse the most recent change (if any) made using undo</p></dd><dt><a name="id2876776"/><span class="term"><a name="undohistory"/>edit-&gt;undo/redo history</span></dt><dd><p><a name="id2876832"/>this will call a display box showing a list of the most recent actions on
+closed.</p></dd></dl></div></div><div class="sect1"><a name="edit"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="edit"/>the edit menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2889798"/><span class="term"><a name="undo"/>edit-&gt;undo (<b>ctrl-z</b>)</span></dt><dd><p><a name="id2889884"/>this is used to eliminate or reverse the most recent user action or operation. just what
+constitutes such an action may be better understood by referring to the <a href="#group-undos">group undos</a> portion of this help file.</p></dd><dt><a name="id2889925"/><span class="term"><a name="redo"/>edit-&gt;redo (<b>ctrl-shift-z</b>)</span></dt><dd><p><a name="id2890020"/>this will reverse the most recent change (if any) made using undo</p></dd><dt><a name="id2890039"/><span class="term"><a name="undohistory"/>edit-&gt;undo/redo history</span></dt><dd><p><a name="id2890096"/>this will call a display box showing a list of the most recent actions on
the left and another list of actions which have been 'undone' on the right.
there are also three buttons at the right of the box labeled
undo, redo, and
@@ -83,15 +83,15 @@ point. a subsequent click on the corresponding button will cause all the
selected actions to be undone or redone accordingly. this would be particularly
useful when the user knows precisely the point to which she or he would like to
proceed - making it unnecessary to go through a series of single undo or redo
-actions.</p></dd><dt><a name="id2876917"/><span class="term"><a name="cut"/>edit-&gt;cut (<b>ctrl-x</b>)</span></dt><dd><p><a name="id2877004"/>this command deletes the current selection and places it on the clipboard. the
+actions.</p></dd><dt><a name="id2890180"/><span class="term"><a name="cut"/>edit-&gt;cut (<b>ctrl-x</b>)</span></dt><dd><p><a name="id2890267"/>this command deletes the current selection and places it on the clipboard. the
clipboard is a feature of kde that works invisibly to provide a way to transfer data between
-applications.</p></dd><dt><a name="id2877025"/><span class="term"><a name="copy"/>edit-&gt;copy (<b>ctrl-c</b>)</span></dt><dd><p><a name="id2877111"/>this copies the currently selected text to the clipboard so that it may be
+applications.</p></dd><dt><a name="id2890288"/><span class="term"><a name="copy"/>edit-&gt;copy (<b>ctrl-c</b>)</span></dt><dd><p><a name="id2890374"/>this copies the currently selected text to the clipboard so that it may be
pasted elsewhere. the clipboard is a feature of kde that works invisibly to
-provide a way to transfer data between applications.</p></dd><dt><a name="id2877132"/><span class="term"><a name="paste"/>edit-&gt;paste (<b>ctrl-v</b>)</span></dt><dd><p><a name="id2877217"/>this will insert the contents of the clipboard at the cursor position. the
+provide a way to transfer data between applications.</p></dd><dt><a name="id2890395"/><span class="term"><a name="paste"/>edit-&gt;paste (<b>ctrl-v</b>)</span></dt><dd><p><a name="id2890480"/>this will insert the contents of the clipboard at the cursor position. the
clipboard is feature of kde that works invisibly to provide a way to transfer
-data between applications.</p></dd><dt><a name="id2877238"/><span class="term"><a name="select-all"/>edit-&gt;select all (<b>ctrl-a</b>)</span></dt><dd><p><a name="id2877326"/>this will select the entire document. this could be very useful for
-copying the entire file to another application.</p></dd><dt><a name="id2877346"/><span class="term"><a name="invert-the-selection"/>edit-&gt;invert selection</span></dt><dd><p><a name="id2877404"/>this selects any unselected text while unselecting any selected text -
-effectively reversing the current state of selection.</p></dd><dt><a name="id2877424"/><span class="term"><a name="find"/>edit-&gt;find (<b>ctrl-f</b>)</span></dt><dd><p><a name="id2877509"/>this opens the find dialog which is used to specify the text to
+data between applications.</p></dd><dt><a name="id2890502"/><span class="term"><a name="select-all"/>edit-&gt;select all (<b>ctrl-a</b>)</span></dt><dd><p><a name="id2890589"/>this will select the entire document. this could be very useful for
+copying the entire file to another application.</p></dd><dt><a name="id2890609"/><span class="term"><a name="invert-the-selection"/>edit-&gt;invert selection</span></dt><dd><p><a name="id2890667"/>this selects any unselected text while unselecting any selected text -
+effectively reversing the current state of selection.</p></dd><dt><a name="id2890687"/><span class="term"><a name="find"/>edit-&gt;find (<b>ctrl-f</b>)</span></dt><dd><p><a name="id2890772"/>this opens the find dialog which is used to specify the text to
find in the document. there is small text box for entering the search
pattern which also doubles as a dropdown box. clicking on the dropdown arrow at
the side of the box makes available other recent search patterns. other
@@ -104,79 +104,79 @@ search within currently selected text. checking whole words
only prevents the search from stopping on words that contain the
searched for pattern. the search from cursor option begins
the search from the current position of the cursor within the document rather
-than from the beginning.</p></dd><dt><a name="id2877590"/><span class="term"><a name="find-again"/>edit-&gt;find next (<b>f3</b>)</span></dt><dd><p><a name="id2877670"/>this repeats the last find operation, if any, without calling the find
-dialog box.</p></dd><dt><a name="id2877689"/><span class="term"><a name="replace"/>edit-&gt;replace (<b>ctrl-r</b>)</span></dt><dd><p><a name="id2877774"/>this command opens the replace dialog box. the replace dialog is
+than from the beginning.</p></dd><dt><a name="id2890853"/><span class="term"><a name="find-again"/>edit-&gt;find next (<b>f3</b>)</span></dt><dd><p><a name="id2890933"/>this repeats the last find operation, if any, without calling the find
+dialog box.</p></dd><dt><a name="id2890952"/><span class="term"><a name="replace"/>edit-&gt;replace (<b>ctrl-r</b>)</span></dt><dd><p><a name="id2891037"/>this command opens the replace dialog box. the replace dialog is
almost identical to the above-mentioned find dialog. in addition to the features in
the find dialog it contains a replace with: text
entry/dropdown box. using this dialog the user can specify both the text to be found
and text with which to replace it. the additional prompt
on replace option allows the user to have kwrite ask for
-confirmation before each replacement.</p></dd><dt><a name="id2877823"/><span class="term"><a name="insertfile"/>
-edit-&gt;insert file</span></dt><dd><p><a name="id2877880"/>this opens the file <a href="#open">open</a> dialog box whereby the
+confirmation before each replacement.</p></dd><dt><a name="id2891086"/><span class="term"><a name="insertfile"/>
+edit-&gt;insert file</span></dt><dd><p><a name="id2891143"/>this opens the file <a href="#open">open</a> dialog box whereby the
user can insert a complete file in the open document. the the contents of
the file will be entered at the position of the blinking text
-cursor.</p></dd></dl></div></div><div class="sect1"><a name="go"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="go"/><span class="title">the go menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2877976"/><span class="term"><a name="go-to-line"/>go-&gt;go to line</span></dt><dd><p><a name="id2878029"/>this opens the goto line dialog box which is used to have the cursor jump
+cursor.</p></dd></dl></div></div><div class="sect1"><a name="go"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="go"/>the go menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2891239"/><span class="term"><a name="go-to-line"/>go-&gt;go to line</span></dt><dd><p><a name="id2891292"/>this opens the goto line dialog box which is used to have the cursor jump
to a particular line (specified by number) in the document. the line number may
be entered directly into the text box or graphically by clicking on the up or
down arrow spin controls at the side of the text box. the little up arrow will
increase the line number and the down arrow decrease it. there is also a slide
control to the right of the text box which allows the user to move the goto
-point in the document in an analog manner.</p></dd><dt><a name="id2878057"/><span class="term"><a name="add-marker"/>go-&gt;add marker (<b>ctrl-m</b>)</span></dt><dd><p><a name="id2878142"/>this creates a marker in the document at the line where the cursor is
+point in the document in an analog manner.</p></dd><dt><a name="id2891320"/><span class="term"><a name="add-marker"/>go-&gt;add marker (<b>ctrl-m</b>)</span></dt><dd><p><a name="id2891405"/>this creates a marker in the document at the line where the cursor is
located and places it at the bottom of the list of markers located at the
bottom of the go menu.</p><p>markers are points within a kwrite document
marked for easy return. if the user thinks (s)he may need to return to a specific
-point (s)he may by way of this feature instruct kwrite to remember it. </p></dd><dt><a name="id2878190"/><span class="term"><a name="set-bookmark"/>go-&gt;set marker</span></dt><dd><p><a name="id2878244"/>this creates a marker in the document at the line where the cursor is
+point (s)he may by way of this feature instruct kwrite to remember it. </p></dd><dt><a name="id2891453"/><span class="term"><a name="set-bookmark"/>go-&gt;set marker</span></dt><dd><p><a name="id2891507"/>this creates a marker in the document at the line where the cursor is
located, and allows the user to choose its position in the list of bookmarks
-which is appended at the bottom of this menu item.</p></dd><dt><a name="id2878266"/><span class="term"><a name="clear-bookmarks"/>go-&gt;clear markers</span></dt><dd><p><a name="id2878320"/>this command will remove all the markers from the docucument as well as the
+which is appended at the bottom of this menu item.</p></dd><dt><a name="id2891529"/><span class="term"><a name="clear-bookmarks"/>go-&gt;clear markers</span></dt><dd><p><a name="id2891583"/>this command will remove all the markers from the docucument as well as the
list of markers which is appended at the bottom of this menu item.</p></dd></dl></div><p>at the bottom of this menu, a list of markers appears if any
-markers are available for this window.</p></div><div class="sect1"><a name="tools"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="tools"/><span class="title">the tools menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2878391"/><span class="term"><a name="spelling..."/>tools-&gt;spelling...</span></dt><dd><p><a name="id2878446"/>this initiates the spell checking program - a program
+markers are available for this window.</p></div><div class="sect1"><a name="tools"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="tools"/>the tools menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2891654"/><span class="term"><a name="spelling..."/>tools-&gt;spelling...</span></dt><dd><p><a name="id2891709"/>this initiates the spell checking program - a program
designed to help the user catch and correct any spelling errors.
clicking on this entry will start the checker and bring up the speller dialog
box through which the user can control the process. there are three text boxes
lined up vertically in the center of the dialog with their corresponding labels
-just to the left. starting at the top they are:</p><div class="variablelist"><dl><dt><a name="id2878480"/><span class="term">misspelled word:</span></dt><dd><p><a name="id2878497"/>here, the spell checker indicates the word currently under
+just to the left. starting at the top they are:</p><div class="variablelist"><dl><dt><a name="id2891743"/><span class="term">misspelled word:</span></dt><dd><p><a name="id2891760"/>here, the spell checker indicates the word currently under
consideration. this happens when the checker encounters a word not in its
dictionary - a file containing a list of correctly spelled words against which
-it compares each word in the editor.</p></dd><dt><a name="id2878519"/><span class="term">replacement:</span></dt><dd><p><a name="id2878536"/> if the checker has any similar words in its dictionary the
+it compares each word in the editor.</p></dd><dt><a name="id2891782"/><span class="term">replacement:</span></dt><dd><p><a name="id2891800"/> if the checker has any similar words in its dictionary the
first one will be listed here. the user can accept the suggestion, type in his
or her own correction, or choose a different suggestion from the next
-box.</p></dd><dt><a name="id2878558"/><span class="term">suggestions:</span></dt><dd><p><a name="id2878575"/> the checker may list here a number of possible replacements for
+box.</p></dd><dt><a name="id2891821"/><span class="term">suggestions:</span></dt><dd><p><a name="id2891838"/> the checker may list here a number of possible replacements for
the word under consideration. clicking on any one of the suggestions will cause
that word to be entered in the replacement: box,
above.</p></dd></dl></div><p>on the right side of the dialog box are 6 buttons that allow the user to
-control the spell check process. they are:</p><div class="variablelist"><dl><dt><a name="id2878623"/><span class="term">replace</span></dt><dd><p><a name="id2878640"/> this button has the checker replace the word under
+control the spell check process. they are:</p><div class="variablelist"><dl><dt><a name="id2891886"/><span class="term">replace</span></dt><dd><p><a name="id2891903"/> this button has the checker replace the word under
consideration in the document with the word in the
-replacement: box.</p></dd><dt><a name="id2878667"/><span class="term">replace all</span></dt><dd><p><a name="id2878684"/> this button causes the checker to replace not only the current
+replacement: box.</p></dd><dt><a name="id2891930"/><span class="term">replace all</span></dt><dd><p><a name="id2891947"/> this button causes the checker to replace not only the current
misspelled word: but to automatically make the same
substitution for any other occurences of this misspelled
-word: in the document.</p></dd><dt><a name="id2878720"/><span class="term">ignore</span></dt><dd><p><a name="id2878737"/>activating this button will have the checker move on without
-making any changes.</p></dd><dt><a name="id2878756"/><span class="term">ignore all</span></dt><dd><p><a name="id2878773"/> this button tells the checker to do nothing with the current
+word: in the document.</p></dd><dt><a name="id2891983"/><span class="term">ignore</span></dt><dd><p><a name="id2892000"/>activating this button will have the checker move on without
+making any changes.</p></dd><dt><a name="id2892019"/><span class="term">ignore all</span></dt><dd><p><a name="id2892036"/> this button tells the checker to do nothing with the current
misspelled word: and to pass over any other instances of
-the same word.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878797">Note</a></h3><p>this only applies to the current spell check
+the same word.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2892060"/>Note</h3><p>this only applies to the current spell check
run. if the checker is run again later it will stop on this same
-word.</p></div></dd><dt><a name="id2878819"/><span class="term">add</span></dt><dd><p><a name="id2878835"/>pressing this button adds the word in the misspelled
+word.</p></div></dd><dt><a name="id2892082"/><span class="term">add</span></dt><dd><p><a name="id2892098"/>pressing this button adds the word in the misspelled
word: box to the checker's dictionary. this means that in the future
the checker will always consider this word to be correctly
-spelled.</p></dd><dt><a name="id2878864"/><span class="term">stop</span></dt><dd><p><a name="id2878881"/> this button stops the spell check process.</p></dd></dl></div><p>located horizontally along the bottom of the spell check dialog is a
+spelled.</p></dd><dt><a name="id2892127"/><span class="term">stop</span></dt><dd><p><a name="id2892144"/> this button stops the spell check process.</p></dd></dl></div><p>located horizontally along the bottom of the spell check dialog is a
progress bar. as the checking process proceeds the bar will fill from left to
right providing a graphical representation of how far along in the document the
process has reached. in addition, the progress is displayed numerically in
-the center of the progress bar.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878921">Note</a></h3><p>a numerical display of the spell check
+the center of the progress bar.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2892184"/>Note</h3><p>a numerical display of the spell check
process is simultaneously displayed in the status bar of the editor. the <a href="#show-statusbar">status bar</a> is the horizontal strip at the bottom
-of the editor just outside of the text entry area.</p></div><p>two more buttons are located below the progress bar. they are:</p><div class="variablelist"><dl><dt><a name="id2878977"/><span class="term">help</span></dt><dd><p><a name="id2878994"/> this invokes the kde help system starting at the kwrite help
-pages (this document).</p></dd><dt><a name="id2879020"/><span class="term">cancel</span></dt><dd><p><a name="id2879037"/> this button cancels the spell check process.</p></dd><dt><a name="id2879056"/><span class="term"><a name="indent"/>tools-&gt;indent</span></dt><dd><p><a name="id2879100"/>this increases the paragraph's indentation by one step. the size of the
-step depends on the <a href="#pref-indent"> indentation
-settings</a>.</p></dd><dt><a name="id2879140"/><span class="term"><a name="unindent"/>tools-&gt;unindent</span></dt><dd><p><a name="id2879184"/>this reduces the paragraph's indentation by one step. the size of the step
-depends on the <a href="#pref-indent"> indentation settings</a>.</p></dd><dt><a name="id2879220"/><span class="term"><a name="cleanindent"/>tools-&gt;clean
-indentation</span></dt><dd><p><a name="id2879264"/>not yet implemented</p></dd><dt><a name="id2879282"/><span class="term">tools-&gt;comment</span></dt><dd><p><a name="id2879314"/>this adds one space to the beginning of the line
+of the editor just outside of the text entry area.</p></div><p>two more buttons are located below the progress bar. they are:</p><div class="variablelist"><dl><dt><a name="id2892240"/><span class="term">help</span></dt><dd><p><a name="id2892257"/> this invokes the kde help system starting at the kwrite help
+pages (this document).</p></dd><dt><a name="id2892283"/><span class="term">cancel</span></dt><dd><p><a name="id2892300"/> this button cancels the spell check process.</p></dd><dt><a name="id2892319"/><span class="term"><a name="indent"/>tools-&gt;indent</span></dt><dd><p><a name="id2892363"/>this increases the paragraph's indentation by one step. the size of the
+step depends on the <a href="#pref-indent" title="indent"> indentation
+settings</a>.</p></dd><dt><a name="id2892403"/><span class="term"><a name="unindent"/>tools-&gt;unindent</span></dt><dd><p><a name="id2892447"/>this reduces the paragraph's indentation by one step. the size of the step
+depends on the <a href="#pref-indent" title="indent"> indentation settings</a>.</p></dd><dt><a name="id2892483"/><span class="term"><a name="cleanindent"/>tools-&gt;clean
+indentation</span></dt><dd><p><a name="id2892527"/>not yet implemented</p></dd><dt><a name="id2892545"/><span class="term">tools-&gt;comment</span></dt><dd><p><a name="id2892578"/>this adds one space to the beginning of the line
where the text cursor is located or to the beginning of any
-selected lines.</p></dd><dt><a name="id2879334"/><span class="term">tools-&gt;uncomment</span></dt><dd><p><a name="id2879367"/>this removes one space (if any exist) from the beginning of the line
+selected lines.</p></dd><dt><a name="id2892598"/><span class="term">tools-&gt;uncomment</span></dt><dd><p><a name="id2892630"/>this removes one space (if any exist) from the beginning of the line
where the text cursor is located or from the beginning of any
-selected lines.</p></dd></dl></div></dd></dl></div></div><div class="sect1"><a name="settings"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="settings"/><span class="title">the settings menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2879433"/><span class="term"><a name="show-toolbar"/>settings-&gt;show toolbar</span></dt><dd><p><a name="id2879491"/>when checked, this displays a movable toolbar containing buttons used to
-initiate frequently used commands. when unchecked the toolbar is hidden.</p></dd><dt><a name="id2879512"/><span class="term"><a name="show-statusbar"/>settings-&gt;show statusbar</span></dt><dd><p><a name="id2879570"/>when checked, this displays a small bar at the bottom of the editor
+selected lines.</p></dd></dl></div></dd></dl></div></div><div class="sect1"><a name="settings"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="settings"/>the settings menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2892696"/><span class="term"><a name="show-toolbar"/>settings-&gt;show toolbar</span></dt><dd><p><a name="id2892754"/>when checked, this displays a movable toolbar containing buttons used to
+initiate frequently used commands. when unchecked the toolbar is hidden.</p></dd><dt><a name="id2892775"/><span class="term"><a name="show-statusbar"/>settings-&gt;show statusbar</span></dt><dd><p><a name="id2892833"/>when checked, this displays a small bar at the bottom of the editor
containing information about the status of the current document. when unchecked
-the statusbar is hidden.</p></dd><dt><a name="id2879591"/><span class="term"><a name="show-path"/>settings-&gt;show path</span></dt><dd><p><a name="id2879648"/>when selected, this displays in the title bar the path (its location in the
-file system) of the current document. when unchecked the path is hidden.</p></dd><dt><a name="id2879668"/><span class="term"><a name="configure-keybindings"/>settings-&gt;configure key bindings</span></dt><dd><p><a name="id2879727"/>this command opens a dialog box whereby the <a href="#keybindings">key bindings</a> may be changed. a display window at
+the statusbar is hidden.</p></dd><dt><a name="id2892854"/><span class="term"><a name="show-path"/>settings-&gt;show path</span></dt><dd><p><a name="id2892911"/>when selected, this displays in the title bar the path (its location in the
+file system) of the current document. when unchecked the path is hidden.</p></dd><dt><a name="id2892932"/><span class="term"><a name="configure-keybindings"/>settings-&gt;configure key bindings</span></dt><dd><p><a name="id2892990"/>this command opens a dialog box whereby the <a href="#keybindings" title="key bindings">key bindings</a> may be changed. a display window at
the top of the dialog box shows the list of commands (actions) that can have
keyboard shortcuts. below the display are three radio buttons. the user may choose
between no key, default key, and custom key. (note that a set of radio buttons only
@@ -191,7 +191,7 @@ the user could select <b>ctrl</b> and <b>alt</b>, click on
the key button, and then press the <b>k</b> key on the keyboard. this
would mean that anytime he or she held down the <b>ctrl</b> and
<b>alt</b> buttons and pressed <b>k</b> (while using
-kwrite) the about kde display box would be called. </p></dd><dt><a name="id2879840"/><span class="term"><a name="configure-toolbars"/>settings-&gt;configure toolbars</span></dt><dd><p><a name="id2879899"/>this will open the dialog whereby the toolbar configuration may
+kwrite) the about kde display box would be called. </p></dd><dt><a name="id2893104"/><span class="term"><a name="configure-toolbars"/>settings-&gt;configure toolbars</span></dt><dd><p><a name="id2893162"/>this will open the dialog whereby the toolbar configuration may
be changed. the user can choose which shortcut buttons should appear on the
toolbar. a display window on the left lists the commands available to placed
on the toolbar. a display on the right lists those commands already on the
@@ -201,23 +201,23 @@ pane onto the right pane, i.e., it is added to the toolbar.
the left arrow does just the opposite, removing any action selected in the right
window from the toolbar. the up and down pointing arrows change the position of
an action selected in the right window which changes the position of its button
-in the toolbar.</p></dd><dt><a name="id2879939"/><span class="term"><a name="preferences"/>settings-&gt;preferences</span></dt><dd><p><a name="id2879994"/>this menu item opens a dialog whereby several different <a href="#pref-dialog">settings</a> may be adjusted.</p></dd><dt><a name="id2880033"/><span class="term">settings-&gt;configure
-highlighting</span></dt><dd><p><a name="id2880078"/>opens a dialog box allowing configuration of the syntax
-highlighting. the dialog is described in <a href="#pref-highlighting">Chapter 5., <i>highlighting</i></a>.</p></dd><dt><a name="id2880116"/><span class="term"><a name="vertical-selection"/>settings-&gt;vertical
-selection</span></dt><dd><p><a name="id2880171"/>this is used to turn on or off the vertical selection feature. vertical
+in the toolbar.</p></dd><dt><a name="id2893202"/><span class="term"><a name="preferences"/>settings-&gt;preferences</span></dt><dd><p><a name="id2893257"/>this menu item opens a dialog whereby several different <a href="#pref-dialog" title="Chapter 4. configure kwrite">settings</a> may be adjusted.</p></dd><dt><a name="id2893296"/><span class="term">settings-&gt;configure
+highlighting</span></dt><dd><p><a name="id2893342"/>opens a dialog box allowing configuration of the syntax
+highlighting. the dialog is described in <a href="#pref-highlighting" title="Chapter 5. highlighting">Chapter 5. highlighting</a>.</p></dd><dt><a name="id2893379"/><span class="term"><a name="vertical-selection"/>settings-&gt;vertical
+selection</span></dt><dd><p><a name="id2893434"/>this is used to turn on or off the vertical selection feature. vertical
selection allows text to be selected by column as well as by row. in other
words with this feature the user is able to select text contained in only
particular contiguous columns and rows. in affect the user can select a
-rectangular area of text anywhere in the document.</p></dd><dt><a name="id2880195"/><span class="term"><a name="set-highlight"/>settings-&gt;highlight mode</span></dt><dd><p><a name="id2880250"/>this allows the user to choose the style of color highlighting which the
+rectangular area of text anywhere in the document.</p></dd><dt><a name="id2893458"/><span class="term"><a name="set-highlight"/>settings-&gt;highlight mode</span></dt><dd><p><a name="id2893513"/>this allows the user to choose the style of color highlighting which the
editor uses to display the text. the styles are selected by programming
-language. the font/color information is not stored with the document.</p></dd><dt><a name="id2880272"/><span class="term"><a name="end-of-line"/>settings-&gt;end of line</span></dt><dd><p><a name="id2880326"/>this opens a sub-menu from which the user can select the type of `end of
-line' code for kwrite to use, i.e., the accepted standard
-used by unix, mac® or msdos/windows® systems.</p></dd></dl></div></div><div class="sect1"><a name="help"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="help"/><span class="title">the help menu</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2880437"/><span class="term"><a name="contents"/>help-&gt;contents (<b>f1</b>)</span></dt><dd><p><a name="id2880514"/>this invokes the kde help system starting at the kwrite help pages (this document).</p></dd><dt><a name="id2880541"/><span class="term"><a name="whats-this"/>help-&gt;what's this? (<b>shift-f1</b>)</span></dt><dd><p><a name="id2880629"/>this changes the mouse cursor to a combination arrow and question mark.
+language. the font/color information is not stored with the document.</p></dd><dt><a name="id2893535"/><span class="term"><a name="end-of-line"/>settings-&gt;end of line</span></dt><dd><p><a name="id2893590"/>this opens a sub-menu from which the user can select the type of &#x2018;end of
+line&#x2019; code for kwrite to use, i.e., the accepted standard
+used by unix, mac® or msdos/windows® systems.</p></dd></dl></div></div><div class="sect1"><a name="help"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="help"/>the help menu</h2></div></div><div class="variablelist"><dl><dt><a name="id2893700"/><span class="term"><a name="contents"/>help-&gt;contents (<b>f1</b>)</span></dt><dd><p><a name="id2893777"/>this invokes the kde help system starting at the kwrite help pages (this document).</p></dd><dt><a name="id2893804"/><span class="term"><a name="whats-this"/>help-&gt;what's this? (<b>shift-f1</b>)</span></dt><dd><p><a name="id2893892"/>this changes the mouse cursor to a combination arrow and question mark.
clicking on items within kwrite with this arrow will open a help window (if
-one exists for the particular item) explaining the item's function.</p></dd><dt><a name="id2880658"/><span class="term"><a name="report-bug"/>help-&gt;report bug</span></dt><dd><p><a name="id2880712"/>this calls a dialog box to help
+one exists for the particular item) explaining the item's function.</p></dd><dt><a name="id2893921"/><span class="term"><a name="report-bug"/>help-&gt;report bug</span></dt><dd><p><a name="id2893975"/>this calls a dialog box to help
the user help the kde team to track down and solve any
problems(bugs) in the program. the dialog attempts to do this by
-means of email using the information given by the user.</p></dd><dt><a name="id2880736"/><span class="term"><a name="about-kwrite"/>help-&gt;about kwrite</span></dt><dd><p><a name="id2880791"/>this will display version and author information</p></dd><dt><a name="id2880809"/><span class="term"><a name="about-kde"/>help-&gt;about kde</span></dt><dd><p><a name="id2880866"/>this displays the kde version and other basic information.</p></dd></dl></div></div></div><div id="pref-dialog" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="pref-dialog"/>Chapter 4. configure kwrite</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#prefcolors">colors</a></dt><dt> <a href="#pref-indent">indent</a></dt><dt> <a href="#pref-select">select</a></dt><dt> <a href="#pref-edit">edit</a></dt><dt> <a href="#prefspellchecker">spelling</a></dt></dl></div><p>selecting
+means of email using the information given by the user.</p></dd><dt><a name="id2893999"/><span class="term"><a name="about-kwrite"/>help-&gt;about kwrite</span></dt><dd><p><a name="id2894054"/>this will display version and author information</p></dd><dt><a name="id2894072"/><span class="term"><a name="about-kde"/>help-&gt;about kde</span></dt><dd><p><a name="id2894129"/>this displays the kde version and other basic information.</p></dd></dl></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="pref-dialog"/>Chapter 4. configure kwrite</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#prefcolors">colors</a></dt><dt> <a href="#pref-indent">indent</a></dt><dt> <a href="#pref-select">select</a></dt><dt> <a href="#pref-edit">edit</a></dt><dt> <a href="#prefspellchecker">spelling</a></dt></dl></div><p>selecting
settings-&gt;configure
kwrite from the menu brings up the configure-kwrite
dialog box. this dialog can be used to alter a number of different settings. the
@@ -229,7 +229,7 @@ dialog by means of the ok button, or
cancel the process. the categories
colors, indent,
select, edit, and
-spelling are detailed below.</p><div class="sect1"><a name="prefcolors"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="prefcolors"/><span class="title">colors</span></h2></div></div><p>this section provides access to <a href="#pref-color-settings">five different color settings</a>,
+spelling are detailed below.</p><div class="sect1"><a name="prefcolors"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="prefcolors"/>colors</h2></div></div><p>this section provides access to <a href="#pref-color-settings">five different color settings</a>,
described below. each of these settings may be changed by clicking on its
corresponding button. these are special wide buttons that are the color of
the current setting. clicking on one of the buttons calls a special color
@@ -262,48 +262,48 @@ display square.) this adds the current color to the custom color palette. this
palette and any other available palettes can be displayed using the drop down
selection box located directly above the palette display at the top right of the
dialog box. besides the custom colors, the user can access a number of
-pre-prepared palettes.</p><div class="variablelist"><dl><dt><a name="pref-color-settings"/><span class="term">background</span></dt><dd><p><a name="id2881208"/>here the user can specify a color for the general background of
-kwrite.</p></dd><dt><a name="id2881234"/><span class="term">text background</span></dt><dd><p><a name="id2881251"/>this is used to set a particular color to display in the
-background of those areas of the document containing text.</p></dd><dt><a name="id2881271"/><span class="term">selected</span></dt><dd><p><a name="id2881288"/>this allows the user to select a color to be used for indicating
-selected (or highlighted) portions of the document.</p></dd><dt><a name="id2881308"/><span class="term">found</span></dt><dd><p><a name="id2881324"/>this specifies the preferred color with which to mark text
+pre-prepared palettes.</p><div class="variablelist"><dl><dt><a name="pref-color-settings"/><span class="term">background</span></dt><dd><p><a name="id2894471"/>here the user can specify a color for the general background of
+kwrite.</p></dd><dt><a name="id2894497"/><span class="term">text background</span></dt><dd><p><a name="id2894514"/>this is used to set a particular color to display in the
+background of those areas of the document containing text.</p></dd><dt><a name="id2894534"/><span class="term">selected</span></dt><dd><p><a name="id2894551"/>this allows the user to select a color to be used for indicating
+selected (or highlighted) portions of the document.</p></dd><dt><a name="id2894571"/><span class="term">found</span></dt><dd><p><a name="id2894588"/>this specifies the preferred color with which to mark text
encountered as the result of a <a href="#find">find</a>
-operation.</p></dd><dt><a name="id2881360"/><span class="term">selected + found</span></dt><dd><p><a name="id2881377"/>this sets the color for text that has not only been found as in
-the previous entry above but that has also been selected.</p></dd></dl></div></div><div class="sect1"><a name="pref-indent"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="pref-indent"/><span class="title">indent</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2881430"/><span class="term">auto indent</span></dt><dd><p><a name="id2881446"/>this causes
+operation.</p></dd><dt><a name="id2894623"/><span class="term">selected + found</span></dt><dd><p><a name="id2894640"/>this sets the color for text that has not only been found as in
+the previous entry above but that has also been selected.</p></dd></dl></div></div><div class="sect1"><a name="pref-indent"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="pref-indent"/>indent</h2></div></div><div class="variablelist"><dl><dt><a name="id2894693"/><span class="term">auto indent</span></dt><dd><p><a name="id2894709"/>this causes
new lines to begin with the same indentation level as the previous
-line.</p></dd><dt><a name="id2881466"/><span class="term">indent with spaces</span></dt><dd><p><a name="id2881483"/>this
+line.</p></dd><dt><a name="id2894729"/><span class="term">indent with spaces</span></dt><dd><p><a name="id2894746"/>this
replaces tabs with the number of spaces selected in the tab width window in
-the <a href="#pref-edit">edit</a> section of the preferences
-dialog.</p></dd><dt><a name="id2881522"/><span class="term">backspace key indents</span></dt><dd><p><a name="id2881539"/>this allows the
+the <a href="#pref-edit" title="edit">edit</a> section of the preferences
+dialog.</p></dd><dt><a name="id2894785"/><span class="term">backspace key indents</span></dt><dd><p><a name="id2894802"/>this allows the
backspace key to be used to
-indent.</p></dd><dt><a name="id2881573"/><span class="term">tab key indents</span></dt><dd><p><a name="id2881590"/>this
+indent.</p></dd><dt><a name="id2894836"/><span class="term">tab key indents</span></dt><dd><p><a name="id2894854"/>this
allows the tab key to be used to
-indent.</p></dd><dt><a name="id2881624"/><span class="term">keep indent profile</span></dt><dd><p><a name="id2881642"/>this
-retains current indentation settings for future documents.</p></dd><dt><a name="id2881660"/><span class="term">keep extra spaces</span></dt><dd><p><a name="id2881677"/>indentations of more than the selected number of spaces
-will not be shortened.</p></dd></dl></div></div><div class="sect1"><a name="pref-select"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="pref-select"/><span class="title">select</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2881730"/><span class="term">persistent selections</span></dt><dd><p><a name="id2881747"/>this prevents key input or cursor movement by way of the
+indent.</p></dd><dt><a name="id2894888"/><span class="term">keep indent profile</span></dt><dd><p><a name="id2894905"/>this
+retains current indentation settings for future documents.</p></dd><dt><a name="id2894923"/><span class="term">keep extra spaces</span></dt><dd><p><a name="id2894940"/>indentations of more than the selected number of spaces
+will not be shortened.</p></dd></dl></div></div><div class="sect1"><a name="pref-select"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="pref-select"/>select</h2></div></div><div class="variablelist"><dl><dt><a name="id2894993"/><span class="term">persistent selections</span></dt><dd><p><a name="id2895010"/>this prevents key input or cursor movement by way of the
arrow keys from causing the elimination of text
-selection. </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2881763">Note</a></h3><p>(note: if the overwrite selections option is
+selection. </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2895026"/>Note</h3><p>(note: if the overwrite selections option is
activated then any typed character input or paste operation will replace
-the selected text.)</p></div></dd><dt><a name="id2881785"/><span class="term">overwrite selections</span></dt><dd><p><a name="id2881802"/>any keyed character input or paste operation will replace
-the selected text. </p></dd><dt><a name="id2881821"/><span class="term">mouse autocopy</span></dt><dd><p><a name="id2881838"/>any text
+the selected text.)</p></div></dd><dt><a name="id2895048"/><span class="term">overwrite selections</span></dt><dd><p><a name="id2895065"/>any keyed character input or paste operation will replace
+the selected text. </p></dd><dt><a name="id2895084"/><span class="term">mouse autocopy</span></dt><dd><p><a name="id2895102"/>any text
selected with the mouse will be automatically copied to the
-clipboard.</p></dd><dt><a name="id2881858"/><span class="term">x11-like single selection</span></dt><dd><p><a name="id2881875"/>not implemented yet.</p></dd><dt><a name="id2881893"/><span class="term">vertical selections</span></dt><dd><p><a name="id2881910"/>this
+clipboard.</p></dd><dt><a name="id2895121"/><span class="term">x11-like single selection</span></dt><dd><p><a name="id2895138"/>not implemented yet.</p></dd><dt><a name="id2895156"/><span class="term">vertical selections</span></dt><dd><p><a name="id2895173"/>this
activates the <a href="#vertical-selection">vertical selection</a>
-option.</p></dd><dt><a name="id2881949"/><span class="term">toggle old</span></dt><dd><p><a name="id2881963"/>not yet implemented</p></dd></dl></div></div><div class="sect1"><a name="pref-edit"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="pref-edit"/><span class="title">edit</span></h2></div></div><div class="variablelist"><dl><dt><a name="id2882013"/><span class="term">word wrap</span></dt><dd><p><a name="id2882040"/>word wrap is a feature that causes the editor to
+option.</p></dd><dt><a name="id2895212"/><span class="term">toggle old</span></dt><dd><p><a name="id2895226"/>not yet implemented</p></dd></dl></div></div><div class="sect1"><a name="pref-edit"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="pref-edit"/>edit</h2></div></div><div class="variablelist"><dl><dt><a name="id2895276"/><span class="term">word wrap</span></dt><dd><p><a name="id2895303"/>word wrap is a feature that causes the editor to
automatically start a new line of text and move (wrap) the cursor to the
beginning of that new line. kwrite will automatically start a new line of text
when the current line reaches the length specified by the <a href="#pref-wrap-words-at">wrap words at:</a>
-option.</p></dd><dt><a name="id2882090"/><span class="term">wrap words
-at:</span></dt><dd><p><a name="id2882116"/>if the <a href="#pref-word-wrap">word wrap</a> option is selected this entry
+option.</p></dd><dt><a name="id2895353"/><span class="term">wrap words
+at:</span></dt><dd><p><a name="id2895379"/>if the <a href="#pref-word-wrap">word wrap</a> option is selected this entry
determines the length (in characters) at which the editor will
-automatically start a new line.</p></dd><dt><a name="id2882155"/><span class="term">replace tabs by
-spaces</span></dt><dd><p><a name="id2882183"/>kwrite will replace any tabs
-with the number of spaces indicated in the <a href="#pref-tab-width">tab width:</a> entry.</p></dd><dt><a name="id2882227"/><span class="term">tab width</span></dt><dd><p><a name="id2882252"/>if the <a href="#pref-word-wrap">replace tabs by spaces</a>
+automatically start a new line.</p></dd><dt><a name="id2895418"/><span class="term">replace tabs by
+spaces</span></dt><dd><p><a name="id2895446"/>kwrite will replace any tabs
+with the number of spaces indicated in the <a href="#pref-tab-width">tab width:</a> entry.</p></dd><dt><a name="id2895490"/><span class="term">tab width</span></dt><dd><p><a name="id2895515"/>if the <a href="#pref-word-wrap">replace tabs by spaces</a>
option is selected this entry determines the number of spaces with which
-the editor will automatically replace tabs.</p></dd><dt><a name="id2882290"/><span class="term">remove trailing spaces</span></dt><dd><p><a name="id2882308"/>kwrite will automatically eliminate extra spaces at the
-ends of lines of text.</p></dd><dt><a name="id2882332"/><span class="term">auto brackets</span></dt><dd><p><a name="id2882349"/>when the
+the editor will automatically replace tabs.</p></dd><dt><a name="id2895554"/><span class="term">remove trailing spaces</span></dt><dd><p><a name="id2895571"/>kwrite will automatically eliminate extra spaces at the
+ends of lines of text.</p></dd><dt><a name="id2895595"/><span class="term">auto brackets</span></dt><dd><p><a name="id2895612"/>when the
user types a left bracket ([,(, or {) kwrite automatically
enters the right bracket (}, ), or ]) to the right of the
-cursor.</p></dd><dt><a name="id2882377"/><span class="term">group undos</span></dt><dd><p><a name="id2882403"/>groups of similar actions are to be considered a single
+cursor.</p></dd><dt><a name="id2895640"/><span class="term">group undos</span></dt><dd><p><a name="id2895666"/>groups of similar actions are to be considered a single
<a href="#undo">undo</a> step by kwrite. in other words, a series
of regular character keystrokes (words or expressions) would be considered
one step and therefore be removed by a single undo operation. if the
@@ -319,79 +319,79 @@ since the last non-entry operation. a second click would eliminate that
operation and a third any operation or series of entries that occurred
before the operation and so on. when not selected three clicks of the undo
button would only remove the last three letters typed, or the last three
-operations.</p></dd><dt><a name="id2882481"/><span class="term">show tabs</span></dt><dd><p><a name="id2882498"/>the editor will display a symbol to indicate the presence
-of a tab in the text.</p></dd><dt><a name="id2882517"/><span class="term">smart home</span></dt><dd><p><a name="id2882534"/>not yet implemented</p></dd><dt><a name="id2882551"/><span class="term">page up/down moves cursor</span></dt><dd><p><a name="id2882569"/>this option changes the behavior of the cursor when
+operations.</p></dd><dt><a name="id2895744"/><span class="term">show tabs</span></dt><dd><p><a name="id2895761"/>the editor will display a symbol to indicate the presence
+of a tab in the text.</p></dd><dt><a name="id2895780"/><span class="term">smart home</span></dt><dd><p><a name="id2895797"/>not yet implemented</p></dd><dt><a name="id2895814"/><span class="term">page up/down moves cursor</span></dt><dd><p><a name="id2895832"/>this option changes the behavior of the cursor when
the user presses the <b>page up</b> or <b>page down</b> key. if
unselected the text cursor will maintain its relative position within the visible
text in kwrite as new text becomes visible as a result of the operation. so if
the cursor is in the middle of the visible text when the operation occurs it will
remain there (except when one reaches the beginning or end.) with this
option selected, the first key press will cause the cursor to move to either the top
-or bottom of the visible text as a new page of text is displayed.</p></dd><dt><a name="id2882620"/><span class="term">wrap cursor</span></dt><dd><p><a name="id2882634"/>when this option is chosen, moving
+or bottom of the visible text as a new page of text is displayed.</p></dd><dt><a name="id2895883"/><span class="term">wrap cursor</span></dt><dd><p><a name="id2895897"/>when this option is chosen, moving
the cursor with the arrow keys off the end of a line (to the right) causes
it to jump down to the beginning of the next line. likewise when the
cursor is moved past the beginning of a line (to the left) it jumps up to
the end of the preceding line. when this option is not selected, moving the
cursor right past the end of a line merely causes it to continue
horizontally in the same line and trying to move it left past the beginning
-does nothing.</p></dd><dt><a name="id2882661"/><span class="term"><a href="#undo">undo</a> steps:</span></dt><dd><p><a name="id2882689"/>here
+does nothing.</p></dd><dt><a name="id2895924"/><span class="term"><a href="#undo">undo</a> steps:</span></dt><dd><p><a name="id2895952"/>here
the user may specify the number of steps kwrite will retain in memory for
purposes of undoing entries and actions. this means that the higher the
number of steps set the more memory kwrite will use for this. setting
this entry to 10 would mean that the user would be be able reverse the last
ten operations, i.e.i&gt;, click the undo
-button 10 times and obtain results.</p></dd></dl></div></div><div class="sect1"><a name="prefspellchecker"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="prefspellchecker"/><span class="title">spelling</span></h2></div></div><p>a spell checker is a program designed to
+button 10 times and obtain results.</p></dd></dl></div></div><div class="sect1"><a name="prefspellchecker"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="prefspellchecker"/>spelling</h2></div></div><p>a spell checker is a program designed to
help the user catch and correct any spelling errors. this section of the
preferences dialog allows certain important settings to be adjusted in this
-regard.</p><div class="variablelist"><dl><dt><a name="id2882789"/><span class="term">create root/affix combinations not in
-dictionary</span></dt><dd><p><a name="id2882806"/>selecting this option allows
+regard.</p><div class="variablelist"><dl><dt><a name="id2896052"/><span class="term">create root/affix combinations not in
+dictionary</span></dt><dd><p><a name="id2896070"/>selecting this option allows
the spell checker to register as 'correct' combinations of root words with
suffixes or prefixes even if the particular combination is not listed in
-its dictionary data base of words.</p></dd><dt><a name="id2882828"/><span class="term">consider run-together words as spelling
-errors</span></dt><dd><p><a name="id2882846"/>selecting this will cause the
+its dictionary data base of words.</p></dd><dt><a name="id2896091"/><span class="term">consider run-together words as spelling
+errors</span></dt><dd><p><a name="id2896109"/>selecting this will cause the
spell checker to register as 'misspelled' two or more correctly spelled
words that are 'run-together', i.e., that do not have spaces
-separating them.</p></dd><dt><a name="id2882874"/><span class="term">dictionary:</span></dt><dd><p><a name="id2882891"/>depending on
+separating them.</p></dd><dt><a name="id2896137"/><span class="term">dictionary:</span></dt><dd><p><a name="id2896154"/>depending on
the user's installation one or more different language spelling
dictionaries may be available. this drop down box allows the user to
-choose which language the spell checker should use.</p></dd><dt><a name="id2882912"/><span class="term">encoding:</span></dt><dd><p><a name="id2882929"/>there are
+choose which language the spell checker should use.</p></dd><dt><a name="id2896176"/><span class="term">encoding:</span></dt><dd><p><a name="id2896192"/>there are
different coding systems used to associate particular codes with particular
characters and symbols. if the user knows which code he or she is using
this drop down box allows this code to be specified so that the spell
-checker can do its job correctly. </p></dd><dt><a name="id2882952"/><span class="term">client:</span></dt><dd><p><a name="id2882969"/>since kwrite
+checker can do its job correctly. </p></dd><dt><a name="id2896215"/><span class="term">client:</span></dt><dd><p><a name="id2896232"/>since kwrite
does not contain its own spell checker, an external one must be chosen.
this is where the user may specify which spell check program to
-use.</p></dd></dl></div></div></div><div id="pref-highlighting" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="pref-highlighting"/>Chapter 5. highlighting</h2></div></div><p>the configure highlighting dialog consists of two
+use.</p></dd></dl></div></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="pref-highlighting"/>Chapter 5. highlighting</h2></div></div><p>the configure highlighting dialog consists of two
pages, defaults and highlighting
modes. the user can select which page to view by clicking on the
appropriate tab at the top of the dialog</p><p>items available on the defaults page are as
-follows:</p><div class="variablelist"><dl><dt><a name="id2883083"/><span class="term">default item styles</span></dt><dd><p><a name="id2883100"/>the user can configure the default appearance for particular items.
+follows:</p><div class="variablelist"><dl><dt><a name="id2896346"/><span class="term">default item styles</span></dt><dd><p><a name="id2896364"/>the user can configure the default appearance for particular items.
this would allow a programmer to more easily identify different items (types of
entries) in his or her code.
-</p><div class="variablelist"><dl><dt><a name="id2883125"/><span class="term">item</span></dt><dd><p><a name="id2883141"/>this drop down list offers a variety of items that the user
+</p><div class="variablelist"><dl><dt><a name="id2896388"/><span class="term">item</span></dt><dd><p><a name="id2896404"/>this drop down list offers a variety of items that the user
might want to highlight. they include normal for
text does not fit in any of the other categories, comment,
string, keyword and many more. not
all of these entries will need to be configured for every language and so may be
selected as needed. the options in the rest of this section apply
-to the entry selected in this box.</p></dd><dt><a name="id2883197"/><span class="term">normal</span></dt><dd><p><a name="id2883213"/>this allows the user to choose the item's normal
+to the entry selected in this box.</p></dd><dt><a name="id2896460"/><span class="term">normal</span></dt><dd><p><a name="id2896476"/>this allows the user to choose the item's normal
(unselected) color. this is done by means of a color selection
-dialog box, a further explanation of which may be found in the <a href="#prefcolors">colors</a> section of <a href="#pref-dialog">configure kwrite</a>.</p></dd><dt><a name="id2883270"/><span class="term">bold</span></dt><dd><p><a name="id2883287"/>this option determines whether or not the item should be displayed in
-bold text.</p></dd><dt><a name="id2883306"/><span class="term">italic</span></dt><dd><p><a name="id2883323"/>this option determines whether or not the item should be displayed in italic
-text.</p></dd><dt><a name="id2883342"/><span class="term">selected</span></dt><dd><p><a name="id2883358"/>this allows the user to choose the item's color
+dialog box, a further explanation of which may be found in the <a href="#prefcolors" title="colors">colors</a> section of <a href="#pref-dialog" title="Chapter 4. configure kwrite">configure kwrite</a>.</p></dd><dt><a name="id2896533"/><span class="term">bold</span></dt><dd><p><a name="id2896550"/>this option determines whether or not the item should be displayed in
+bold text.</p></dd><dt><a name="id2896569"/><span class="term">italic</span></dt><dd><p><a name="id2896586"/>this option determines whether or not the item should be displayed in italic
+text.</p></dd><dt><a name="id2896605"/><span class="term">selected</span></dt><dd><p><a name="id2896622"/>this allows the user to choose the item's color
when selected. this is done by means of a color selection
-dialog box, a further explanation of which may be found in the <a href="#prefcolors">colors</a> section of <a href="#pref-dialog">configure kwrite</a>.</p></dd></dl></div></dd><dt><a name="id2883416"/><span class="term">default font</span></dt><dd><p><a name="id2883433"/>here the user can choose the default font for all
-text.</p><div class="variablelist"><dl><dt><a name="id2883455"/><span class="term">family</span></dt><dd><p><a name="id2883472"/>this is used to choose the font family. the default is fixed.
+dialog box, a further explanation of which may be found in the <a href="#prefcolors" title="colors">colors</a> section of <a href="#pref-dialog" title="Chapter 4. configure kwrite">configure kwrite</a>.</p></dd></dl></div></dd><dt><a name="id2896679"/><span class="term">default font</span></dt><dd><p><a name="id2896696"/>here the user can choose the default font for all
+text.</p><div class="variablelist"><dl><dt><a name="id2896718"/><span class="term">family</span></dt><dd><p><a name="id2896735"/>this is used to choose the font family. the default is fixed.
for most programming purposes, a monospaced font (one in which a w takes up the same
-amount of space as an i) may be the best choice.</p></dd><dt><a name="id2883493"/><span class="term">size</span></dt><dd><p><a name="id2883510"/>the font size can be changed here. the default is 12
-points.</p></dd><dt><a name="id2883529"/><span class="term">charset</span></dt><dd><p><a name="id2883546"/>here the user can choose which character set to work in.</p></dd></dl></div></dd></dl></div><p>items on the highlight modes tab allow the user to define
+amount of space as an i) may be the best choice.</p></dd><dt><a name="id2896756"/><span class="term">size</span></dt><dd><p><a name="id2896773"/>the font size can be changed here. the default is 12
+points.</p></dd><dt><a name="id2896792"/><span class="term">charset</span></dt><dd><p><a name="id2896809"/>here the user can choose which character set to work in.</p></dd></dl></div></dd></dl></div><p>items on the highlight modes tab allow the user to define
more specific highlighting depending on the language style.</p><p>one need not set every available option, items not configured
specifically will use the default configuration specified on the previous
-(defaults tab.</p><div class="variablelist"><dl><dt><a name="id2883613"/><span class="term">config select</span></dt><dd><p><a name="id2883630"/>this group of options is used to customize the highlighting styles
+(defaults tab.</p><div class="variablelist"><dl><dt><a name="id2896876"/><span class="term">config select</span></dt><dd><p><a name="id2896894"/>this group of options is used to customize the highlighting styles
for each programming language type. any changes you made in
-other areas of this dialog apply only to this type.</p><div class="variablelist"><dl><dt><a name="id2883655"/><span class="term">highlight</span></dt><dd><p><a name="id2883671"/>this is used to choose the language type to
-configure</p></dd><dt><a name="id2883690"/><span class="term">item</span></dt><dd><p><a name="id2883707"/>this is to choose the syntax item to configure. remember
+other areas of this dialog apply only to this type.</p><div class="variablelist"><dl><dt><a name="id2896918"/><span class="term">highlight</span></dt><dd><p><a name="id2896934"/>this is used to choose the language type to
+configure</p></dd><dt><a name="id2896953"/><span class="term">item</span></dt><dd><p><a name="id2896970"/>this is to choose the syntax item to configure. remember
this only configures <i>this</i> item for <i>this</i>
language.</p></dd></dl></div><p>as an example, if the user wished to configure the appearance of
&#x201C;comments&#x201D; while writing c++, she or he could choose c++ in the
@@ -400,23 +400,23 @@ item drop down list. to have &#x201C;comments&#x201D; look
the same across all languages, the user would need to configure this in the
defaults page of this dialog box while leaving
&#x201C;comments&#x201D; unconfigured within the more specific
-highlight modes page.</p></dd><dt><a name="id2883815"/><span class="term">item style</span></dt><dd><p><a name="id2883832"/>here the user can configure the general appearance of the above
+highlight modes page.</p></dd><dt><a name="id2897078"/><span class="term">item style</span></dt><dd><p><a name="id2897095"/>here the user can configure the general appearance of the above
selected item. checking the default checkbox causes the default
style as configured on the previous tab to be set, or the
appearance can be configured directly. the available options are the same as on the
defaults tab: normal,
selected, bold and
-italic.</p></dd><dt><a name="id2883902"/><span class="term">highlight auto select</span></dt><dd><p><a name="id2883919"/>kwrite can apply syntax highlighting automatically, depending
+italic.</p></dd><dt><a name="id2897165"/><span class="term">highlight auto select</span></dt><dd><p><a name="id2897182"/>kwrite can apply syntax highlighting automatically, depending
on the file extension or mime-type of the opened file. the defaults are fairly
comprehensive, but users that regularly edit files with non-standard extensions
can add them here. wildcards are allowed in the file
extensions text box. for example, the default entry for the c++
language is <b><tt>*.cpp;*.cc;*.c;*.h</tt></b>. opening a file called
-<tt>foo.h</tt> would automatically apply the c++ style to it.</p></dd><dt><a name="id2883973"/><span class="term">item font</span></dt><dd><p><a name="id2883990"/>here the user can choose the font for the selected item.</p><p>the default style can be applied by checking the
+<tt>foo.h</tt> would automatically apply the c++ style to it.</p></dd><dt><a name="id2897236"/><span class="term">item font</span></dt><dd><p><a name="id2897253"/>here the user can choose the font for the selected item.</p><p>the default style can be applied by checking the
default checkbox or the user can choose a specific font
family, size and
charset. the available options are the same as those on
-the defaults tab.</p></dd></dl></div></div><div id="credits" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="credits"/>Chapter 6. credits and licenses</h2></div></div><p>kwrite copyright 2000 by jochen wilhelmy
-<tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></p><p>contributions:</p><div class="itemizedlist"><ul><li><p><a name="id2884118"/>additional contributions by glen parker <tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></p></li><li><p><a name="id2884140"/>michael koch <tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></p></li></ul></div><p>documentation by thad mcginnis <tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></p><div class="itemizedlist"><ul><li><p><a name="id2884184"/>this version of the kwrite handbook is based on the original by cristian tibirna <tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></p></li></ul></div><p>converted to docbook/proofreading by lauri watts <tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></p><p><a name="gnu-fdl"/>this documentation is licensed under the terms of the <a href="common/fdl-license.html" target="_top">gnu free documentation
-license</a>.</p><p>this program is licensed under the terms of the <a href="common/gpl-translated.html" target="_top">gnu general public license</a>.</p></div><div id="installation" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="installation"/>Appendix A. installation</h2></div></div><p>kwrite is packaged as part of the kdebase package. for more information
+the defaults tab.</p></dd></dl></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="credits"/>Chapter 6. credits and licenses</h2></div></div><p>kwrite copyright 2000 by jochen wilhelmy
+<tt>&lt;<a href="mailto:digisnap@cs.tu-berlin.de">digisnap@cs.tu-berlin.de</a>&gt;</tt></p><p>contributions:</p><div class="itemizedlist"><ul><li><p><a name="id2897381"/>additional contributions by glen parker <tt>&lt;<a href="mailto:glenebob@nwlink.com">glenebob@nwlink.com</a>&gt;</tt></p></li><li><p><a name="id2897403"/>michael koch <tt>&lt;<a href="mailto:koch@kde.org">koch@kde.org</a>&gt;</tt></p></li></ul></div><p>documentation by thad mcginnis <tt>&lt;<a href="mailto:ctmcginnis@compuserve.com">ctmcginnis@compuserve.com</a>&gt;</tt></p><div class="itemizedlist"><ul><li><p><a name="id2897447"/>this version of the kwrite handbook is based on the original by cristian tibirna <tt>&lt;<a href="mailto:tibirna@kde.org">tibirna@kde.org</a>&gt;</tt></p></li></ul></div><p>converted to docbook/proofreading by lauri watts <tt>&lt;<a href="mailto:vampyr@atconnex.net">vampyr@atconnex.net</a>&gt;</tt></p><p><a name="gnu-fdl"/>this documentation is licensed under the terms of the <a href="common/fdl-license.html" target="_top">gnu free documentation
+license</a>.</p><p>this program is licensed under the terms of the <a href="common/gpl-translated.html" target="_top">gnu general public license</a>.</p></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="installation"/>Appendix A. installation</h2></div></div><p>kwrite is packaged as part of the kdebase package. for more information
on installing and compiling kde please see <a href="http://www.kde.org" target="_top">www.kde.org</a>.</p></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/multilingual.xhtml b/tests/docbook/result/xhtml/multilingual.xhtml
index a88e155b..165a8e76 100644
--- a/tests/docbook/result/xhtml/multilingual.xhtml
+++ b/tests/docbook/result/xhtml/multilingual.xhtml
@@ -1,502 +1,502 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Multilingual Test Document</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2799237"><div class="titlepage"><div><h1 class="title"><a name="id2799237"/>Multilingual Test Document</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#cachap">Catalan</a></dt><dt>2. <a href="#cschap">Czech</a></dt><dt>3. <a href="#dachap">Danish</a></dt><dt>4. <a href="#eschap">Spanish</a></dt><dt>5. <a href="#fichap">Finnish</a></dt><dt>6. <a href="#frchap">French</a></dt><dt>7. <a href="#itchap">Italian</a></dt><dt>8. <a href="#dechap">German</a></dt><dt>9. <a href="#elchap">Greek</a></dt><dt>10. <a href="#enchap">English</a></dt><dt>11. <a href="#jachap">Japanese</a></dt><dt>12. <a href="#rochap">Romanian</a></dt><dt>13. <a href="#ruchap">Russian</a></dt><dt>14. <a href="#nochap">Norsk</a></dt><dt>15. <a href="#nlchap">Dutch</a></dt><dt>16. <a href="#plchap">Polish</a></dt><dt>17. <a href="#ptchap">Portuguese</a></dt><dt>18. <a href="#ptbrchap">Portuguese (Brazilian)</a></dt><dt>19. <a href="#skchap">Slovak</a></dt><dt>20. <a href="#svchap">Swedish</a></dt><dt><a href="#bibl">Bibliography</a></dt></dl></div><div id="cachap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="cachap"/>Capítol 1. Catalan</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2753952">NOTA</a></h3><p>
+<html><head><title>Multilingual Test Document</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2770548"><div class="titlepage"><div><h1 class="title"><a name="id2770548"/>Multilingual Test Document</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#cachap">Catalan</a></dt><dt>2 <a href="#cschap">Czech</a></dt><dt>3 <a href="#dachap">Danish</a></dt><dt>4 <a href="#eschap">Spanish</a></dt><dt>5 <a href="#fichap">Finnish</a></dt><dt>6 <a href="#frchap">French</a></dt><dt>7 <a href="#itchap">Italian</a></dt><dt>8 <a href="#dechap">German</a></dt><dt>9 <a href="#elchap">Greek</a></dt><dt>10 <a href="#enchap">English</a></dt><dt>11 <a href="#jachap">Japanese</a></dt><dt>12 <a href="#rochap">Romanian</a></dt><dt>13 <a href="#ruchap">Russian</a></dt><dt>14 <a href="#nochap">Norsk</a></dt><dt>15 <a href="#nlchap">Dutch</a></dt><dt>16 <a href="#plchap">Polish</a></dt><dt>17 <a href="#ptchap">Portuguese</a></dt><dt>18 <a href="#ptbrchap">Portuguese (Brazilian)</a></dt><dt>19 <a href="#skchap">Slovak</a></dt><dt>20 <a href="#svchap">Swedish</a></dt><dt><a href="#bibl">Bibliography</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="cachap"/>Capítol 1. Catalan</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2770687"/>Nota</h3><p>
This paragraph would be in Catalan, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="cschap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="cschap"/>Kapitola 2. Czech</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2799363">Poznámka</a></h3><p>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="cschap"/>Kapitola 2. Czech</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2770754"/>Poznámka</h3><p>
This paragraph would be in Czech, if I knew any.
&#x201E;Quote test.&#x201C;
</p></div><p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="dachap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="dachap"/>Kapitel 3. Danish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2758001">NOTE</a></h3><p>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="dachap"/>Kapitel 3. Danish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2767374"/>Note</h3><p>
This paragraph would be in Danish, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="eschap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="eschap"/>Capítulo 4. Spanish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2758402">NOTA</a></h3><p>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="eschap"/>Capítulo 4. Spanish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2767426"/>Nota</h3><p>
This paragraph would be in Spanish, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="fichap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="fichap"/>Luku 5. Finnish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2752863">HUOMAA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="fichap"/>Luku 5. Finnish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2766077"/>Huomaa</h3><p>
This paragraph would be in Finnish, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="frchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="frchap"/>Chapitre 6. French</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2753264">Note</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="frchap"/>Chapitre 6. French</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2766477"/>Note</h3><p>
This paragraph would be in French, if I knew any.
«Quote test.»
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="itchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="itchap"/>Capitolo 7. Italian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2753665">NOTA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="itchap"/>Capitolo 7. Italian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2766878"/>Nota</h3><p>
This paragraph would be in Italian, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="dechap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="dechap"/>Kapitel 8. German</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2863138">Anmerkung</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="dechap"/>Kapitel 8. German</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876404"/>Anmerkung</h3><p>
This paragraph would be in German, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="elchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="elchap"/>ÊåöÜëáéï 9. Greek</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2863477">ÓÇÌÅÉÙÓÇ</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="elchap"/>ÊåöÜëáéï 9. Greek</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2876744"/>Óçìåßùóç</h3><p>
This paragraph would be in Greek, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="enchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="enchap"/>Chapter 10. English</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2863817">Note</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="enchap"/>Chapter 10. English</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877084"/>Note</h3><p>
This paragraph is in English.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="jachap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="jachap"/>&#x7AE0; 11. Japanese</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864156">&#x6CE8;&#x610F;</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="jachap"/>&#x7B2C;11&#x7AE0;</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877423"/>&#x6CE8;&#x610F;</h3><p>
This paragraph would be in Japanese, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="rochap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="rochap"/>Cap. 12. Romanian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864495">NOTÃ</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="rochap"/>Cap. 12. Romanian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2877762"/>Notã</h3><p>
This paragraph would be in Romanian, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="ruchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ruchap"/>&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2864834">&#x417;&#x410;&#x41C;&#x415;&#x427;&#x410;&#x41D;&#x418;&#x415;</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ruchap"/>&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878101"/>&#x417;&#x430;&#x43C;&#x435;&#x447;&#x430;&#x43D;&#x438;&#x435;</h3><p>
This paragraph would be in Russian, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="nochap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="nochap"/>Kapittel 14. Norsk</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2865174">NOTAT</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="nochap"/>Kapittel 14. Norsk</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878441"/>Notat</h3><p>
This paragraph would be in Norsk, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="nlchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="nlchap"/>Hoofdstuk 15. Dutch</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2865513">N.B.</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="nlchap"/>Hoofdstuk 15. Dutch</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2878780"/>Opmerking</h3><p>
This paragraph would be in Dutch, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="plchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="plchap"/>Rozdzia³ 16. Polish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2865852">NOTATKA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="plchap"/>Rozdzia&#x142; 16. Polish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2879119"/>Notatka</h3><p>
This paragraph would be in Polish, if I knew any.
-&#x201C;Quote test.&#x201D;
+&#x201E;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="ptchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ptchap"/>Capítulo 17. Portuguese</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2866191">NOTA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ptchap"/>Capítulo 17. Portuguese</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2879458"/>Nota</h3><p>
This paragraph would be in Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="ptbrchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ptbrchap"/>Capítulo 18. Portuguese (Brazilian)</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2866531">NOTA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ptbrchap"/>Capítulo 18. Portuguese (Brazilian)</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2879798"/>Nota</h3><p>
This paragraph would be in Brazilian Portugeuse, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="skchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="skchap"/>Kapitola 19. Slovak</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2866871">POZNÁMKA</a></h3><p>
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="skchap"/>Kapitola 19. Slovak</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2880138"/>Poznámka</h3><p>
This paragraph would be in Slovak, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div id="svchap" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="svchap"/>Kapitel 20. Swedish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2867210">NOT</a></h3><p>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="svchap"/>Kapitel 20. Swedish</h2></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="id2880478"/>Not</h3><p>
This paragraph would be in Swedish, if I knew any.
&#x201C;Quote test.&#x201D;
</p></div><p>
-See <a href="#cachap">Capítol 1., <i>Catalan</i></a>.
-See <a href="#cschap">Kapitola 2., <i>Czech</i></a>.
-See <a href="#dachap">Kapitel 3., <i>Danish</i></a>.
-See <a href="#dechap">Kapitel 8., <i>German</i></a>.
-See <a href="#elchap">ÊåöÜëáéï 9., <i>Greek</i></a>.
-See <a href="#enchap">Chapter 10., <i>English</i></a>.
-See <a href="#eschap">Capítulo 4., <i>Spanish</i></a>.
-See <a href="#fichap">Luku 5., <i>Finnish</i></a>.
-See <a href="#frchap">Chapitre 6., <i>French</i></a>.
-See <a href="#itchap">Capitolo 7., <i>Italian</i></a>.
-See <a href="#jachap">&#x7AE0; 11., <i>Japanese</i></a>.
-See <a href="#nlchap">Hoofdstuk 15., <i>Dutch</i></a>.
-See <a href="#nochap">Kapittel 14., <i>Norsk</i></a>.
-See <a href="#plchap">Rozdzia³ 16., <i>Polish</i></a>.
-See <a href="#ptchap">Capítulo 17., <i>Portuguese</i></a>.
-See <a href="#ptbrchap">Capítulo 18., <i>Portuguese (Brazilian)</i></a>.
-See <a href="#rochap">Cap. 12., <i>Romanian</i></a>.
-See <a href="#ruchap">&#x413;&#x43B;&#x430;&#x432;&#x430; 13., <i>Russian</i></a>.
-See <a href="#skchap">Kapitola 19., <i>Slovak</i></a>.
-See <a href="#svchap">Kapitel 20., <i>Swedish</i></a>.
-See <a href="#bibl">&#x201C;Bibliography&#x201D;</a>.
-</p></div><div class="bibliography"><h2 class="title"><a name="bibl">Bibliography</a></h2><div id="id2867526" class="biblioentry"><a name="id2867526"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho, Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div></div></body></html>
+See <a href="#cachap" title="Capítol 1. Catalan">Capítol 1. Catalan</a>.
+See <a href="#cschap" title="Kapitola 2. Czech">2 &#x2013; &#x201E;Czech&#x201C;</a>.
+See <a href="#dachap" title="Kapitel 3. Danish">Kapitel 3. Danish</a>.
+See <a href="#dechap" title="Kapitel 8. German">Kapitel 8. German</a>.
+See <a href="#elchap" title="ÊåöÜëáéï 9. Greek">ÊåöÜëáéï 9. Greek</a>.
+See <a href="#enchap" title="Chapter 10. English">Chapter 10. English</a>.
+See <a href="#eschap" title="Capítulo 4. Spanish">Capítulo 4. Spanish</a>.
+See <a href="#fichap" title="Luku 5. Finnish">Luku 5. Finnish</a>.
+See <a href="#frchap" title="Chapitre 6. French">Chapitre 6. French</a>.
+See <a href="#itchap" title="Capitolo 7. Italian">Capitolo 7. Italian</a>.
+See <a href="#jachap" title="&#x7B2C;11&#x7AE0;">&#x7B2C;11&#x7AE0;</a>.
+See <a href="#nlchap" title="Hoofdstuk 15. Dutch">Hoofdstuk 15. Dutch</a>.
+See <a href="#nochap" title="Kapittel 14. Norsk">Kapittel 14. Norsk</a>.
+See <a href="#plchap" title="Rozdzia&#x142; 16. Polish">Rozdzia&#x142; 16. Polish</a>.
+See <a href="#ptchap" title="Capítulo 17. Portuguese">Capítulo 17. Portuguese</a>.
+See <a href="#ptbrchap" title="Capítulo 18. Portuguese (Brazilian)">Capítulo 18. Portuguese (Brazilian)</a>.
+See <a href="#rochap" title="Cap. 12. Romanian">Cap. 12. Romanian</a>.
+See <a href="#ruchap" title="&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</a>.
+See <a href="#skchap" title="Kapitola 19. Slovak">Kapitola 19. Slovak</a>.
+See <a href="#svchap" title="Kapitel 20. Swedish">Kapitel 20. Swedish</a>.
+See <a href="#bibl" title="Bibliography">Bibliography</a>.
+</p></div><div id="bibl" class="bibliography"><div class="titlepage"><div><h2 class="title"><a name="bibl"/>Bibliography</h2></div></div><div id="id2880793" class="biblioentry"><a name="id2880793"/><p><span class="abbrev">[AhoSethiUllman96] </span><span class="authorgroup">Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </span><span class="title"><I>Compilers, Principles, Techniques, and Tools</I>. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span><span class="copyright">Copyright © 1996 Bell Telephone Laboratories, Inc.. </span><span class="isbn">0-201-10088-6. </span><span class="editor">James T. DeWolf. </span><span class="seriesinfo"><span class="title"><I>Computer Science</I>. </span><span class="editor">Michael A. Harrison. </span><span class="publisher"><span class="publishername">Addison-Wesley Publishing Company. </span></span></span></p></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/qa.xhtml b/tests/docbook/result/xhtml/qa.xhtml
index 94f28fc9..768402e1 100644
--- a/tests/docbook/result/xhtml/qa.xhtml
+++ b/tests/docbook/result/xhtml/qa.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>book title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599650"><div class="titlepage"><div><h1 class="title"><a name="id2599650"/>book title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#id2757359">chapter test</a></dt><dd><dl><dt> <a href="#id2754205">Section title</a></dt></dl></dd><dt>A. <a href="#id2753093">appendix test</a></dt><dd><dl><dt> <a href="#id2863357">Section title</a></dt></dl></dd></dl></div><div id="id2757359" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2757359"/>Chapter 1. chapter test</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2754205">Section title</a></dt></dl></div><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>1.1. <a href="#id2755630">Q&amp;A Div 1</a></dt><dd><dl><dt>1.1.Q1. <a href="#id2755640">Question para 1</a></dt></dl></dd><dt>1.2. <a href="#id2755706">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2755716">Question para 1</a></dt><dt> <a href="#id2755770">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2755630">1.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2755640"><b>1.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2755706">1.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2755716"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2755770"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (none)</h2><dl><dt>1.1. <a href="#id2755852">Q&amp;A Div 1</a></dt><dd><dl><dt>1.1.Q1. <a href="#id2755862">Question para 1</a></dt></dl></dd><dt>1.2. <a href="#id2799370">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2799380">Question para 1</a></dt><dt> <a href="#id2799291">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2755852">1.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2755862"><b>1.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2799370">1.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2799380"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2799291"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (number)</h2><dl><dt>1.1. <a href="#id2757406">Q&amp;A Div 1</a></dt><dd><dl><dt>1.1.Q1. <a href="#id2757417">Question para 1</a></dt></dl></dd><dt>1.2. <a href="#id2757382">Q&amp;A Div 2</a></dt><dd><dl><dt>1.2.1. <a href="#id2753866">Question para 1</a></dt><dt>1.2.2. <a href="#id2753920">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2757406">1.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2757417"><b>1.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2757382">1.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753866"><b>1.2.1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2753920"><b>1.2.2. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (qanda)</h2><dl><dt>1.1. <a href="#id2754003">Q&amp;A Div 1</a></dt><dd><dl><dt>1.1.Q1. <a href="#id2754014">Question para 1</a></dt></dl></dd><dt>1.2. <a href="#id2754080">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2754091">Question para 1</a></dt><dt>Q: <a href="#id2754145">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2754003">1.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2754014"><b>1.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2754080">1.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2754091"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2754145"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="section"><a name="id2754205"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2754205"/><span class="title">Section title</span></h2></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (unspecified)</h3><dl><dt>1. <a href="#id2754230">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2754240">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2754307">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2754317">Question para 1</a></dt><dt> <a href="#id2754371">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2754230">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2754240"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2754307">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2754317"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2754371"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (none)</h3><dl><dt>1. <a href="#id2754457">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2754467">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2752509">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2752520">Question para 1</a></dt><dt> <a href="#id2752574">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2754457">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2754467"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2752509">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2752520"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2752574"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (number)</h3><dl><dt>1. <a href="#id2752660">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2752670">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2752736">Q&amp;A Div 2</a></dt><dd><dl><dt>2.1. <a href="#id2752747">Question para 1</a></dt><dt>2.2. <a href="#id2752801">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2752660">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2752670"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2752736">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2752747"><b>2.1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2752801"><b>2.2. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (qanda)</h3><dl><dt>1. <a href="#id2752888">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2752898">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2752964">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2752975">Question para 1</a></dt><dt>Q: <a href="#id2753029">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2752888">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2752898"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2752964">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2752975"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2753029"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div><div id="id2753093" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2753093"/>Appendix A. appendix test</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2863357">Section title</a></dt></dl></div><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>A.1. <a href="#id2753117">Q&amp;A Div 1</a></dt><dd><dl><dt>A.1.Q1. <a href="#id2753128">Question para 1</a></dt></dl></dd><dt>A.2. <a href="#id2753194">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2753204">Question para 1</a></dt><dt> <a href="#id2753258">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2753117">A.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753128"><b>A.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2753194">A.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753204"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2753258"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (none)</h2><dl><dt>A.1. <a href="#id2753344">Q&amp;A Div 1</a></dt><dd><dl><dt>A.1.Q1. <a href="#id2753355">Question para 1</a></dt></dl></dd><dt>A.2. <a href="#id2753421">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2753432">Question para 1</a></dt><dt> <a href="#id2753486">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2753344">A.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753355"><b>A.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2753421">A.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753432"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2753486"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (number)</h2><dl><dt>A.1. <a href="#id2753572">Q&amp;A Div 1</a></dt><dd><dl><dt>A.1.Q1. <a href="#id2753583">Question para 1</a></dt></dl></dd><dt>A.2. <a href="#id2753649">Q&amp;A Div 2</a></dt><dd><dl><dt>A.2.1. <a href="#id2753660">Question para 1</a></dt><dt>A.2.2. <a href="#id2753714">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2753572">A.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753583"><b>A.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2753649">A.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2753660"><b>A.2.1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2753714"><b>A.2.2. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (qanda)</h2><dl><dt>A.1. <a href="#id2863156">Q&amp;A Div 1</a></dt><dd><dl><dt>A.1.Q1. <a href="#id2863166">Question para 1</a></dt></dl></dd><dt>A.2. <a href="#id2863233">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2863243">Question para 1</a></dt><dt>Q: <a href="#id2863297">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2863156">A.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2863166"><b>A.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2863233">A.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2863243"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2863297"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="section"><a name="id2863357"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2863357"/><span class="title">Section title</span></h2></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (unspecified)</h3><dl><dt>1. <a href="#id2863381">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2863392">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2863458">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2863469">Question para 1</a></dt><dt> <a href="#id2863523">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2863381">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863392"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2863458">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863469"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2863523"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (none)</h3><dl><dt>1. <a href="#id2863601">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2863611">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2863678">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2863688">Question para 1</a></dt><dt> <a href="#id2863742">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2863601">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863611"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2863678">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863688"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2863742"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (number)</h3><dl><dt>1. <a href="#id2863820">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2863831">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2863897">Q&amp;A Div 2</a></dt><dd><dl><dt>2.1. <a href="#id2863908">Question para 1</a></dt><dt>2.2. <a href="#id2863962">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2863820">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863831"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2863897">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2863908"><b>2.1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2863962"><b>2.2. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (qanda)</h3><dl><dt>1. <a href="#id2864040">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1. <a href="#id2864050">Question para 1</a></dt></dl></dd><dt>2. <a href="#id2864117">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2864127">Question para 1</a></dt><dt>Q: <a href="#id2864181">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2864040">1. Q&amp;A Div 1</a></h4><div class="qandaentry"><div class="question"><p><a name="id2864050"><b>1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2864117">2. Q&amp;A Div 2</a></h4><div class="qandaentry"><div class="question"><p><a name="id2864127"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2864181"><b>Q: </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div></div></body></html>
+<html><head><title>book title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2764339"><div class="titlepage"><div><h1 class="title"><a name="id2764339"/>book title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#id2812544">chapter test</a></dt><dd><dl><dt> <a href="#id2767455">Section title</a></dt></dl></dd><dt>A <a href="#id2766342">appendix test</a></dt><dd><dl><dt> <a href="#id2876614">Section title</a></dt></dl></dd></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2812544"/>Chapter 1. chapter test</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2767455">Section title</a></dt></dl></div><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>1.1 <a href="#id2768886">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1 <a href="#id2768901">Question para 1</a></dt></dl></dd><dt>1.2 <a href="#id2768962">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2768978">Question para 1</a></dt><dt> <a href="#id2769032">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2768886"/>1.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2768901"/><b>1.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2768929"/><b>1.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2768962"/>1.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2768978"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2769001"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2769032"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2769055"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (none)</h2><dl><dt>1.1 <a href="#id2769109">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1 <a href="#id2769124">Question para 1</a></dt></dl></dd><dt>1.2 <a href="#id2876089">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2876104">Question para 1</a></dt><dt> <a href="#id2812605">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2769109"/>1.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2769124"/><b>1.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2774757"/><b>1.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2876089"/>1.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2876104"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2812574"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2812605"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2812635"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (number)</h2><dl><dt>1.1 <a href="#id2770605">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1 <a href="#id2770620">Question para 1</a></dt></dl></dd><dt>1.2 <a href="#id2770680">Q&amp;A Div 2</a></dt><dd><dl><dt>1.1 <a href="#id2767118">Question para 1</a></dt><dt>1.2 <a href="#id2767172">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2770605"/>1.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2770620"/><b>1.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2770647"/><b>1.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2770680"/>1.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2767118"/><b>1.1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767141"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2767172"/><b>1.2 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767195"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (qanda)</h2><dl><dt>1.1 <a href="#id2767253">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1 <a href="#id2767268">Question para 1</a></dt></dl></dd><dt>1.2 <a href="#id2767330">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2767345">Question para 1</a></dt><dt>Q: <a href="#id2767399">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2767253"/>1.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2767268"/><b>1.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767296"/><b>1.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2767330"/>1.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2767345"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767368"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2767399"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767422"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="section"><a name="id2767455"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767455"/>Section title</h2></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (unspecified)</h3><dl><dt>1 <a href="#id2767479">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2767495">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2767556">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2767572">Question para 1</a></dt><dt> <a href="#id2767626">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2767479"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2767495"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767523"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2767556"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2767572"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767595"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2767626"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767649"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (none)</h3><dl><dt>1 <a href="#id2767706">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2767722">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2765759">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2765774">Question para 1</a></dt><dt> <a href="#id2765828">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2767706"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2767722"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2767225"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2765759"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2765774"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2765797"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2765828"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2765851"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (number)</h3><dl><dt>1 <a href="#id2765909">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2765924">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2765986">Q&amp;A Div 2</a></dt><dd><dl><dt>1 <a href="#id2766001">Question para 1</a></dt><dt>2 <a href="#id2766055">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2765909"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2765924"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2765953"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2765986"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2766001"/><b>1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766024"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2766055"/><b>2 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766078"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (qanda)</h3><dl><dt>1 <a href="#id2766137">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2766152">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2766214">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2766229">Question para 1</a></dt><dt>Q: <a href="#id2766283">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2766137"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2766152"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766181"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2766214"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2766229"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766252"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2766283"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766306"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2766342"/>Appendix A. appendix test</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2876614">Section title</a></dt></dl></div><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>A.1 <a href="#id2766367">Q&amp;A Div 1</a></dt><dd><dl><dt>A.Q1 <a href="#id2766382">Question para 1</a></dt></dl></dd><dt>A.2 <a href="#id2766444">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2766459">Question para 1</a></dt><dt> <a href="#id2766513">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2766367"/>A.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2766382"/><b>A.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766410"/><b>A.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2766444"/>A.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2766459"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766482"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2766513"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766536"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (none)</h2><dl><dt>A.1 <a href="#id2766594">Q&amp;A Div 1</a></dt><dd><dl><dt>A.Q1 <a href="#id2766609">Question para 1</a></dt></dl></dd><dt>A.2 <a href="#id2766671">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2766686">Question para 1</a></dt><dt> <a href="#id2766740">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2766594"/>A.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2766609"/><b>A.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766637"/><b>A.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2766671"/>A.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2766686"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766709"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2766740"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766763"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (number)</h2><dl><dt>A.1 <a href="#id2766822">Q&amp;A Div 1</a></dt><dd><dl><dt>A.Q1 <a href="#id2766837">Question para 1</a></dt></dl></dd><dt>A.2 <a href="#id2766899">Q&amp;A Div 2</a></dt><dd><dl><dt>A.1 <a href="#id2766914">Question para 1</a></dt><dt>A.2 <a href="#id2766968">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2766822"/>A.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2766837"/><b>A.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766865"/><b>A.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2766899"/>A.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2766914"/><b>A.1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766937"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2766968"/><b>A.2 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2765883"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h2 class="title">Q&amp;A Set (qanda)</h2><dl><dt>A.1 <a href="#id2876413">Q&amp;A Div 1</a></dt><dd><dl><dt>A.Q1 <a href="#id2876428">Question para 1</a></dt></dl></dd><dt>A.2 <a href="#id2876490">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2876505">Question para 1</a></dt><dt>Q: <a href="#id2876559">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2876413"/>A.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="id2876428"/><b>A.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876457"/><b>A.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2876490"/>A.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2876505"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876528"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2876559"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876582"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="section"><a name="id2876614"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2876614"/>Section title</h2></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (unspecified)</h3><dl><dt>1 <a href="#id2876639">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2876654">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2876716">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2876731">Question para 1</a></dt><dt> <a href="#id2876785">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2876639"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2876654"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876682"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2876716"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2876731"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876754"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2876785"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876808"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (none)</h3><dl><dt>1 <a href="#id2876858">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2876873">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2876935">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2876950">Question para 1</a></dt><dt> <a href="#id2877004">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2876858"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2876873"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876902"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2876935"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2876950"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2876974"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2877004"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877028"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (number)</h3><dl><dt>1 <a href="#id2877078">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2877093">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2877154">Q&amp;A Div 2</a></dt><dd><dl><dt>1 <a href="#id2877170">Question para 1</a></dt><dt>2 <a href="#id2877224">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2877078"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2877093"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877121"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2877154"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2877170"/><b>1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877193"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2877224"/><b>2 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877247"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div><div class="qandaset"><h3 class="title">Q&amp;A Set (qanda)</h3><dl><dt>1 <a href="#id2877297">Q&amp;A Div 1</a></dt><dd><dl><dt>Q1 <a href="#id2877312">Question para 1</a></dt></dl></dd><dt>2 <a href="#id2877374">Q&amp;A Div 2</a></dt><dd><dl><dt>Q: <a href="#id2877389">Question para 1</a></dt><dt>Q: <a href="#id2877443">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h4 class="title"><a name="id2877297"/>1 Q&amp;A Div 1</h4><div class="qandaentry"><div class="question"><p><a name="id2877312"/><b>Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877341"/><b>A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h4 class="title"><a name="id2877374"/>2 Q&amp;A Div 2</h4><div class="qandaentry"><div class="question"><p><a name="id2877389"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877413"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2877443"/><b>Q: </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2877467"/><b>A: </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/qa2.xhtml b/tests/docbook/result/xhtml/qa2.xhtml
index ef6d1304..a584b073 100644
--- a/tests/docbook/result/xhtml/qa2.xhtml
+++ b/tests/docbook/result/xhtml/qa2.xhtml
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>book title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2751437"><div class="titlepage"><div><h1 class="title"><a name="id2751437"/>book title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#id2760493">chapter test</a></dt></dl></div><div id="id2760493" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2760493"/>Chapter 1. chapter test</h2></div></div><p>Test a cross reference to a question: <a href="#q1">Q: 1.1.Q1.</a>.
-</p><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>1.1. <a href="#id2757948">Q&amp;A Div 1</a></dt><dd><dl><dt>1.1.Q1. <a href="#id2757960">Question para 1</a></dt></dl></dd><dt>1.2. <a href="#id2758151">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2758163">Question para 1</a></dt><dt> <a href="#id2848485">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2757948">1.1. Q&amp;A Div 1</a></h3><div class="qandaentry"><div class="question"><p><a name="id2757960"><b>1.1.Q1. </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b>1.1.A1. </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2758151">1.2. Q&amp;A Div 2</a></h3><div class="qandaentry"><div class="question"><p><a name="id2758163"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2848485"><b> </b>Question para 1</a></p><p>Question para 2</p></div><div class="answer"><p><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div></body></html>
+<html><head><title>book title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="id2599781"><div class="titlepage"><div><h1 class="title"><a name="id2599781"/>book title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#id2773749">chapter test</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2773749"/>Chapter 1. chapter test</h2></div></div><p>Test a cross reference to a question: <a href="#q1" title="">Q: 1.Q1</a>.
+</p><div class="qandaset"><h2 class="title">Q&amp;A Set (unspecified)</h2><dl><dt>1.1 <a href="#id2771289">Q&amp;A Div 1</a></dt><dd><dl><dt>1.Q1 <a href="#q1">Question para 1</a></dt></dl></dd><dt>1.2 <a href="#id2771492">Q&amp;A Div 2</a></dt><dd><dl><dt> <a href="#id2771510">Question para 1</a></dt><dt> <a href="#id2771202">Question para 1</a></dt></dl></dd></dl><div class="qandadiv"><h3 class="title"><a name="id2771289"/>1.1 Q&amp;A Div 1</h3><div class="qandaentry"><div class="question"><p><a name="q1"/><b>1.Q1 </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="a1"/><b>1.A1 </b>Answer para 1</p><p>Answer para 2</p></div></div></div><div class="qandadiv"><h3 class="title"><a name="id2771492"/>1.2 Q&amp;A Div 2</h3><div class="qandaentry"><div class="question"><p><a name="id2771510"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2768970"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div><div class="qandaentry"><div class="question"><p><a name="id2771202"/><b> </b>Question para 1</p><p>Question para 2</p></div><div class="answer"><p><a name="id2766944"/><b> </b>Answer para 1</p><p>Answer para 2</p></div></div></div></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/sectest.xhtml b/tests/docbook/result/xhtml/sectest.xhtml
index 3227fbc7..ed4a76fc 100644
--- a/tests/docbook/result/xhtml/sectest.xhtml
+++ b/tests/docbook/result/xhtml/sectest.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 by Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
+<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><div><h3 class="corpauthor">Some Corporation</h3></div><div><h3 class="author">Norman Walsh</h3></div><div><p class="copyright">Copyright © 1998 Norman Walsh</p></div><div><div class="legalnotice"><p class="legalnotice-title"><b>Legal Notice</b></p><p>This is a test document. You can do what you will with it.</p></div></div><div><div class="legalnotice"><p>This is a second legal notice. But it's not noteworthy.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
@@ -7,8 +7,8 @@
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
Some more text. Some more text. Some more text. Some more text.
- </p></div></div><hr/></div><div id="id2799237" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2799237"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
-of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2862756">Preface Title</a></dt><dt>1. <a href="#chapter">XRef Tests</a></dt><dd><dl><dt> <a href="#id2757869">Section 1 Title</a></dt><dt> <a href="#id2753246">Section 1 Title</a></dt></dl></dd></dl></div><div id="id2862756" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2862756"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2757869">Section 1 Title</a></dt><dt> <a href="#id2753246">Section 1 Title</a></dt></dl></div><h3>Xrefs</h3><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book"><i>Book Title</i></a></td></tr><tr><td>???</td></tr><tr><td><a href="#chapter">Chapter 1., <i>XRef Tests</i></a></td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr></table><p>blah blah blah blah blah blah blah blah blah blah blah blah
+ </p></div></div><hr/></div><div id="id2774710" class="dedication"><div class="titlepage"><div><h2 class="title"><a name="id2774710"/>Dedication</h2></div></div><p>This test book is dedicated to all the testers. This is the first para
+of the dedication.</p><p>This is the second para of the dedication.</p><p>This is the third para of the dedication.</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2876038">Preface Title</a></dt><dt>1 <a href="#chapter">XRef Tests</a></dt><dd><dl><dt> <a href="#id2767192">Section 1 Title</a></dt><dt> <a href="#id2766588">Section 1 Title</a></dt></dl></dd></dl></div><div id="id2876038" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2876038"/>Preface Title</h2></div></div><p>Preface content.</p><p>This is the second para of the preface.</p><p>This is the third para of the preface.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. XRef Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2767192">Section 1 Title</a></dt><dt> <a href="#id2766588">Section 1 Title</a></dt></dl></div><h4>Xrefs</h4><table class="simplelist" border="0" summary="Simple list"><tr><td><a href="#book" title="Book Title">Book Title</a></td></tr><tr><td>???</td></tr><tr><td><a href="#chapter" title="Chapter 1. XRef Tests">Chapter 1. XRef Tests</a></td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr><tr><td>???</td></tr></table><p>blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
@@ -58,7 +58,7 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
-</p><div class="section"><a name="id2757869"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2757869"/><span class="title">Section 1 Title</span></h2></div></div><p>blah blah blah blah blah blah blah blah blah blah blah blah
+</p><div class="section"><a name="id2767192"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2767192"/>Section 1 Title</h2></div></div><p>blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
@@ -448,7 +448,7 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
-</p></div><div class="section"><a name="id2753246"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2753246"/><span class="title">Section 1 Title</span></h2></div></div><p>blah blah blah blah blah blah blah blah blah blah blah blah
+</p></div><div class="section"><a name="id2766588"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2766588"/>Section 1 Title</h2></div></div><p>blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah blah
diff --git a/tests/docbook/result/xhtml/set.xhtml b/tests/docbook/result/xhtml/set.xhtml
index 37ebe441..83ddbc71 100644
--- a/tests/docbook/result/xhtml/set.xhtml
+++ b/tests/docbook/result/xhtml/set.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Set Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="set" id="id2757211"><div class="titlepage"><div><h1 class="title"><a name="id2757211"/>Set Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2757221">Book Test Document Title</a></dt><dd><dl><dt> <a href="#id2757279">Foreword</a></dt><dt>1. <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2862627">First Sect1</a></dt><dt> <a href="#id2862661">Second Sect1</a></dt><dt> <a href="#id2862694">Third Sect1</a></dt></dl></dd><dt>A. <a href="#id2862717">First Appendix</a></dt><dd><dl><dt> <a href="#id2799260">First Sect1</a></dt><dt> <a href="#id2799281">Second Sect1</a></dt><dt> <a href="#id2799302">Third Sect1</a></dt></dl></dd></dl></dd><dt> <a href="#id2799179">Book Test Document Title</a></dt><dd><dl><dt> <a href="#id2755431">Foreword</a></dt><dt>1. <a href="#id2755454">Section Tests</a></dt><dd><dl><dt> <a href="#id2755468">First Sect1</a></dt><dt> <a href="#id2755489">Second Sect1</a></dt><dt> <a href="#id2755510">Third Sect1</a></dt></dl></dd><dt>A. <a href="#id2755533">First Appendix</a></dt></dl></dd></dl></div><div class="book" id="id2757221"><div class="titlepage"><div><h1 class="title"><a name="id2757221"/>Book Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2757279">Foreword</a></dt><dt>1. <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2862627">First Sect1</a></dt><dt> <a href="#id2862661">Second Sect1</a></dt><dt> <a href="#id2862694">Third Sect1</a></dt></dl></dd><dt>A. <a href="#id2862717">First Appendix</a></dt><dd><dl><dt> <a href="#id2799260">First Sect1</a></dt><dt> <a href="#id2799281">Second Sect1</a></dt><dt> <a href="#id2799302">Third Sect1</a></dt></dl></dd></dl></div><div id="id2757279" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2757279"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div id="chapter" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. Section Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2862627">First Sect1</a></dt><dt> <a href="#id2862661">Second Sect1</a></dt><dt> <a href="#id2862694">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2862627"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2862627"/><span class="title">First Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2862661"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2862661"/><span class="title">Second Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2862694"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2862694"/><span class="title">Third Sect1</span></h2></div></div><p>Paragraph.</p></div></div><div id="id2862717" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2862717"/>Appendix A. First Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2799260">First Sect1</a></dt><dt> <a href="#id2799281">Second Sect1</a></dt><dt> <a href="#id2799302">Third Sect1</a></dt></dl></div><p>This is just a test.</p><div class="sect1"><a name="id2799260"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2799260"/><span class="title">First Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2799281"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2799281"/><span class="title">Second Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2799302"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2799302"/><span class="title">Third Sect1</span></h2></div></div><p>Paragraph.</p></div></div></div><div class="book" id="id2799179"><div class="titlepage"><div><h1 class="title"><a name="id2799179"/>Book Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2755431">Foreword</a></dt><dt>1. <a href="#id2755454">Section Tests</a></dt><dd><dl><dt> <a href="#id2755468">First Sect1</a></dt><dt> <a href="#id2755489">Second Sect1</a></dt><dt> <a href="#id2755510">Third Sect1</a></dt></dl></dd><dt>A. <a href="#id2755533">First Appendix</a></dt></dl></div><div id="id2755431" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2755431"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div id="id2755454" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2755454"/>Chapter 1. Section Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2755468">First Sect1</a></dt><dt> <a href="#id2755489">Second Sect1</a></dt><dt> <a href="#id2755510">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2755468"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2755468"/><span class="title">First Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2755489"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2755489"/><span class="title">Second Sect1</span></h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2755510"/><div class="titlepage"><div><h2 class="title" style="clear: all"><a name="id2755510"/><span class="title">Third Sect1</span></h2></div></div><p>Paragraph.</p></div></div><div id="id2755533" class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2755533"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p></div></div></div></body></html>
+<html><head><title>Set Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="set" id="id2770466"><div class="titlepage"><div><h1 class="title"><a name="id2770466"/>Set Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2770474">Book Test Document Title</a></dt><dd><dl><dt> <a href="#id2770531">Foreword</a></dt><dt>1 <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2599803">First Sect1</a></dt><dt> <a href="#id2763320">Second Sect1</a></dt><dt> <a href="#id2875949">Third Sect1</a></dt></dl></dd><dt>A <a href="#id2875972">First Appendix</a></dt><dd><dl><dt> <a href="#id2812491">First Sect1</a></dt><dt> <a href="#id2812512">Second Sect1</a></dt><dt> <a href="#id2812533">Third Sect1</a></dt></dl></dd></dl></dd><dt> <a href="#id2812410">Book Test Document Title</a></dt><dd><dl><dt> <a href="#id2812468">Foreword</a></dt><dt>1 <a href="#id2768704">Section Tests</a></dt><dd><dl><dt> <a href="#id2768718">First Sect1</a></dt><dt> <a href="#id2768739">Second Sect1</a></dt><dt> <a href="#id2768760">Third Sect1</a></dt></dl></dd><dt>A <a href="#id2768783">First Appendix</a></dt></dl></dd></dl></div><div class="book" id="id2770474"><div class="titlepage"><div><h1 class="title"><a name="id2770474"/>Bookinfo Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2770531">Foreword</a></dt><dt>1 <a href="#chapter">Section Tests</a></dt><dd><dl><dt> <a href="#id2599803">First Sect1</a></dt><dt> <a href="#id2763320">Second Sect1</a></dt><dt> <a href="#id2875949">Third Sect1</a></dt></dl></dd><dt>A <a href="#id2875972">First Appendix</a></dt><dd><dl><dt> <a href="#id2812491">First Sect1</a></dt><dt> <a href="#id2812512">Second Sect1</a></dt><dt> <a href="#id2812533">Third Sect1</a></dt></dl></dd></dl></div><div id="id2770531" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2770531"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="chapter"/>Chapter 1. Section Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2599803">First Sect1</a></dt><dt> <a href="#id2763320">Second Sect1</a></dt><dt> <a href="#id2875949">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2599803"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2599803"/>First Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2763320"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2763320"/>Second Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2875949"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2875949"/>Third Sect1</h2></div></div><p>Paragraph.</p></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2875972"/>Appendix A. First Appendix</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2812491">First Sect1</a></dt><dt> <a href="#id2812512">Second Sect1</a></dt><dt> <a href="#id2812533">Third Sect1</a></dt></dl></div><p>This is just a test.</p><div class="sect1"><a name="id2812491"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2812491"/>First Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2812512"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2812512"/>Second Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2812533"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2812533"/>Third Sect1</h2></div></div><p>Paragraph.</p></div></div></div><div class="book" id="id2812410"><div class="titlepage"><div><h1 class="title"><a name="id2812410"/>Bookinfo Test Document Title</h1></div><div><h2 class="subtitle">Book Subtitle</h2></div><div><h3 class="author">Norman Walsh</h3></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2812468">Foreword</a></dt><dt>1 <a href="#id2768704">Section Tests</a></dt><dd><dl><dt> <a href="#id2768718">First Sect1</a></dt><dt> <a href="#id2768739">Second Sect1</a></dt><dt> <a href="#id2768760">Third Sect1</a></dt></dl></dd><dt>A <a href="#id2768783">First Appendix</a></dt></dl></div><div id="id2812468" class="preface"><div class="titlepage"><div><h2 class="title"><a name="id2812468"/>Foreword</h2></div></div><p>This is a test paragraph.</p></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="id2768704"/>Chapter 1. Section Tests</h2></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt> <a href="#id2768718">First Sect1</a></dt><dt> <a href="#id2768739">Second Sect1</a></dt><dt> <a href="#id2768760">Third Sect1</a></dt></dl></div><div class="sect1"><a name="id2768718"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2768718"/>First Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2768739"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2768739"/>Second Sect1</h2></div></div><p>Paragraph.</p></div><div class="sect1"><a name="id2768760"/><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="id2768760"/>Third Sect1</h2></div></div><p>Paragraph.</p></div></div><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="id2768783"/>Appendix A. First Appendix</h2></div></div><p>This is just a test.</p></div></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/table.xhtml b/tests/docbook/result/xhtml/table.xhtml
index 1e2d21cd..865ba484 100644
--- a/tests/docbook/result/xhtml/table.xhtml
+++ b/tests/docbook/result/xhtml/table.xhtml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Chapter 1. test</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="ch1" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>How many ° can you ©.</p><div class="table"><p><a name="id2755542"/><b>Table 1.1. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2799267"/><b>Table 1.2. A Table</b></p><table summary="A Table" border="1" width="4in"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2753732"/><b>Table 1.3. A Table</b></p><table summary="A Table" border="1" width="7in"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2754128"/><b>Table 1.4. A Table</b></p><table summary="A Table" border="1" width="85%"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td> </td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div></div></body></html>
+<html><head><title>Chapter 1. test</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>How many ° can you ©.</p><div class="table"><p><a name="id2768794"/><b>Table 1.1. A Table</b></p><table summary="A Table" border="1"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2812524"/><b>Table 1.2. A Table</b></p><table summary="A Table" border="1" width="4in"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2767011"/><b>Table 1.3. A Table</b></p><table summary="A Table" border="1" width="7in"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div><div class="table"><p><a name="id2767384"/><b>Table 1.4. A Table</b></p><table summary="A Table" border="1" width="85%"><colgroup><col/><col align="right"/><col/></colgroup><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td rowspan="2">2</td><td>3</td></tr><tr><td>1</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>2</td><td>3</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan="2">2</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/test.xhtml b/tests/docbook/result/xhtml/test.xhtml
index c1c74e31..dac141b9 100644
--- a/tests/docbook/result/xhtml/test.xhtml
+++ b/tests/docbook/result/xhtml/test.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Article Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/><meta name="keywords" content="keyword1, keyword2, keyword3"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="id2751437" class="article"><div class="titlepage"><div><h1 class="title"><a name="id2751437"/>Article Title</h1></div><hr/></div><pre class="screen">This
+<html><head><title>Article Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/><meta name="keywords" content="keyword1, keyword2, keyword3"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article"><div class="titlepage"><div><h2 class="title"><a name="id2763267"/>Article Title</h2></div><hr/></div><pre class="screen">This
is With a line-annotation
a
screen<a name="foo"/><img src="../images/callouts/1.png" alt="1" border="0"/>
@@ -10,4 +10,4 @@ screen
This
is With a line-annotation
a
- screen</pre><p>What about <a href="#foo"><img src="../images/callouts/1.png" alt="1" border="0"/></a>?</p><div class="mediaobjectco"><img src="http://maps.example.com/EARTH?USA?MA?AMHERST"/></div></div></body></html>
+ screen</pre><p>What about <a href="#foo" title=""><img src="../images/callouts/1.png" alt="1" border="0"/></a>?</p><div class="mediaobjectco"><img src="http://maps.example.com/EARTH?USA?MA?AMHERST"/></div></div></body></html>
diff --git a/tests/docbook/result/xhtml/verbtest.xhtml b/tests/docbook/result/xhtml/verbtest.xhtml
index 7dfe767b..fdfa2b7a 100644
--- a/tests/docbook/result/xhtml/verbtest.xhtml
+++ b/tests/docbook/result/xhtml/verbtest.xhtml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.29"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="#ch1">test</a></dt></dl></div><div id="ch1" class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>How many ° can you ©.</p><p>And what about <a href="#ch1">Chapter 1., <i>test</i></a>.</p><p>And what about ???.</p><pre class="programlisting">
+<html><head><title>Book Title</title><meta name="generator" content="DocBook XSL Stylesheets V1.40"/></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" id="book"><div class="titlepage"><div><h1 class="title"><a name="book"/>Book Title</h1></div><hr/></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1 <a href="#ch1">test</a></dt></dl></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="ch1"/>Chapter 1. test</h2></div></div><p>How many ° can you ©.</p><p>And what about <a href="#ch1" title="Chapter 1. test">Chapter 1. test</a>.</p><p>And what about ???.</p><pre class="programlisting">
This is a program
listing.
</pre></div></div></body></html>
diff --git a/tests/docbook/template/ChangeLog b/tests/docbook/template/ChangeLog
new file mode 100644
index 00000000..965817ce
--- /dev/null
+++ b/tests/docbook/template/ChangeLog
@@ -0,0 +1,15 @@
+2001-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * titlepage.xsl: Reworked titlepage template processing to support use of more interesting
+ predicates.
+
+ Note: in previous versions, at most one title, subtitle, or titleabbrev
+ element would be processed for each title page. In the new design, if you
+ have multiple title, subtitle, or titleabbrev elements inside an info
+ wrapper (you shouldn't!), they will all be processed.
+
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * README, biblioentry.xsl, testtemplate.xml, titlepage.xsl:
+ New file.
+
diff --git a/tests/docbook/template/README b/tests/docbook/template/README
new file mode 100644
index 00000000..a84d084b
--- /dev/null
+++ b/tests/docbook/template/README
@@ -0,0 +1,15 @@
+This directory contains rudimentary support for the notion of
+stylesheet templates.
+
+The idea is that if you want to change the behavior of the
+stylesheets, for example, processing different bibliography
+elements, you will construct a tempate document that describes
+what you want and then process that template with the "template"
+stylesheet.
+
+The result of this processing will be a customization layer for
+the DocBook XSL Stylesheets that does what you want. This
+removes the stylesheet customizer from the burdon of figuring
+out how the stylesheets work and modifying them.
+
+In theory, anyway... \ No newline at end of file
diff --git a/tests/docbook/template/biblioentry.xsl b/tests/docbook/template/biblioentry.xsl
new file mode 100644
index 00000000..44a26dd3
--- /dev/null
+++ b/tests/docbook/template/biblioentry.xsl
@@ -0,0 +1,72 @@
+<!-- THIS IS BROKEN -->
+<!-- ==================================================================== -->
+
+<xsl:template match="t:biblioentry">
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">biblioentry</xsl:attribute>
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">id</xsl:attribute>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">object.id</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="{@wrapper}">
+ <xsl:attribute name="id">{$id}</xsl:attribute>
+ <xsl:attribute name="class">{name(.)}</xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="a">
+ <xsl:attribute name="name">{$id}</xsl:attribute>
+ </xsl:element>
+ <xsl:apply-templates mode="biblioentry"/>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+
+<!--
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">biblioentry/biblioset</xsl:attribute>
+ <xsl:apply-templates mode="biblioentry"/>
+ </xsl:element>
+-->
+</xsl:template>
+
+<xsl:template match="t:if" mode="biblioentry">
+ <xsl:element name="xsl:if">
+ <xsl:attribute name="test">
+ <xsl:value-of select="@test"/>
+ </xsl:attribute>
+ <xsl:apply-templates mode="biblioentry"/>
+ </xsl:element>
+</xsl:template>
+
+<xsl:template match="t:text" mode="biblioentry">
+ <xsl:element name="xsl:text">
+ <xsl:apply-templates/>
+ </xsl:element>
+</xsl:template>
+
+<xsl:template match="*" mode="biblioentry">
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">bibliography.mode</xsl:attribute>
+ </xsl:element>
+</xsl:template>
+
+<xsl:template match="t:or" mode="biblioentry">
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">
+ <xsl:call-template name="element-or-list"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">bibliography.mode</xsl:attribute>
+ </xsl:element>
+</xsl:template>
+
diff --git a/tests/docbook/template/testtemplate.xml b/tests/docbook/template/testtemplate.xml
new file mode 100644
index 00000000..9a9c3c85
--- /dev/null
+++ b/tests/docbook/template/testtemplate.xml
@@ -0,0 +1,38 @@
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+ base-stylesheet="../html/docbook.xsl">
+
+<t:variable name="section.autonumber" select="true()"/>
+<t:variable name="html.stylesheet">docbook.css</t:variable>
+
+<t:titlepage element="article" side="recto">
+ <title predicate="[1]"/>
+ <subtitle predicate="[1]"/>
+ <corpauthor/>
+ <author/>
+ <authorgroup>
+ <t:or>
+ <corpauthor/>
+ <author/>
+ <editor/>
+ </t:or>
+ </authorgroup>
+ <editor/>
+ <releaseinfo/>
+ <copyright/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+</t:titlepage>
+
+<t:biblioentry>
+ <abbrev/>
+ <title/>
+ <t:or>
+ <authorgroup/>
+ <author/>
+ </t:or>
+ <biblioset/>
+</t:biblioentry>
+
+</t:templates> \ No newline at end of file
diff --git a/tests/docbook/template/titlepage.xsl b/tests/docbook/template/titlepage.xsl
new file mode 100644
index 00000000..200fb382
--- /dev/null
+++ b/tests/docbook/template/titlepage.xsl
@@ -0,0 +1,1129 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+ xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ exclude-result-prefixes="doc"
+ version='1.0'>
+
+<!-- ********************************************************************
+ $Id$
+ ********************************************************************
+
+ This file is part of the XSL DocBook Stylesheet distribution.
+ See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+ and other information.
+
+ ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
+<doc:reference xmlns="">
+<referenceinfo>
+<releaseinfo role="meta">
+$Id$
+</releaseinfo>
+<author><surname>Walsh</surname>
+<firstname>Norman</firstname></author>
+<copyright><year>1999</year><year>2000</year>
+<holder>Norman Walsh</holder>
+</copyright>
+</referenceinfo>
+<title>Template Stylesheet Reference</title>
+
+<partintro>
+<section><title>Introduction</title>
+
+<para>This is technical reference documentation for the DocBook XSL
+Stylesheets; it documents (some of) the parameters, templates, and
+other elements of the stylesheets.</para>
+
+<para>This is not intended to be <quote>user</quote> documentation.
+It is provided for developers writing customization layers for the
+stylesheets, and for anyone who's interested in <quote>how it
+works</quote>.</para>
+
+<para>Although I am trying to be thorough, this documentation is known
+to be incomplete. Don't forget to read the source, too :-)</para>
+</section>
+</partintro>
+
+</doc:reference>
+
+<!-- ==================================================================== -->
+
+<xsl:preserve-space elements="*"/>
+<xsl:strip-space elements="xsl:* t:*"/>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:templates" xmlns="">
+<refpurpose>Construct a stylesheet for the templates provided</refpurpose>
+
+<refdescription>
+<para>The <literal>t:templates</literal> element is the root of a
+set of templates. This template creates an appropriate
+<literal>xsl:stylesheet</literal> for the templates.</para>
+
+<para>If the <literal>t:templates</literal> element has a
+<literal>base-stylesheet</literal> attribute, an
+<literal>xsl:import</literal> statement is constructed for it.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:templates">
+ <xsl:element name="xsl:stylesheet">
+ <xsl:attribute name="version">1.0</xsl:attribute>
+
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:comment>
+ <xsl:text> This stylesheet was created by </xsl:text>
+ <xsl:text>template/titlepage.xsl; </xsl:text>
+ <xsl:text>do not edit it by hand. </xsl:text>
+ </xsl:comment>
+
+ <xsl:if test="@base-stylesheet">
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:import">
+ <xsl:attribute name="href">
+ <xsl:value-of select="@base-stylesheet"/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+
+ <xsl:apply-templates/>
+
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="xsl:*" xmlns="">
+<refpurpose>Copy xsl: elements straight through</refpurpose>
+
+<refdescription>
+<para>This template simply copies the xsl: elements
+straight through into the result tree.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="xsl:*">
+ <xsl:apply-templates select="." mode="copy"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:titlepage" xmlns="">
+<refpurpose>Create the templates necessary to construct a title page</refpurpose>
+
+<refdescription>
+<para>The <literal>t:titlepage</literal> element creates a set of
+templates for processing the titlepage for an element. The
+<quote>root</quote> of this template set is the template named
+<quote><literal>wrapper.titlepage</literal></quote>. That is the
+template that should be called to generate the title page.
+</para>
+
+<para>The <literal>t:titlepage</literal> element has three attributes:
+
+<variablelist>
+<varlistentry><term>element</term>
+<listitem><para>The name of the source document element for which
+these templates apply. In other words, to make a title page for the
+<sgmltag>article</sgmltag> element, set the
+<sgmltag class="attribute">element</sgmltag> attribute to
+<quote><literal>article</literal></quote>. This attribute is required.
+</para></listitem>
+</varlistentry>
+<varlistentry><term>wrapper</term>
+<listitem><para>The entire title page can be wrapped with an element.
+This attribute identifies that element.
+</para></listitem>
+</varlistentry>
+<varlistentry><term>class</term>
+<listitem><para>If the <sgmltag class="attribute">class</sgmltag> attribute
+is set, a <sgmltag class="attribute">class</sgmltag> attribute with this
+value will be added to the wrapper element that surrounds the entire
+title page.
+</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<para>Any other attributes are copied through literally to the
+wrapper element.</para>
+
+<para>The content of a <literal>t:titlepage</literal> is one or
+more <literal>t:titlepage-content</literal>,
+<literal>t:titlepage-separator</literal>, and
+<literal>t:titlepage-before</literal> elements.</para>
+
+<para>Each of these elements may be provided for the <quote>recto</quote>
+and <quote>verso</quote> sides of the title page.</para>
+
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:titlepage">
+ <!-- process the children to make the templates for the content,
+ separator, and before elements -->
+ <xsl:apply-templates/>
+
+ <!-- output the title page template -->
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage</xsl:text>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="{@wrapper}">
+ <xsl:apply-templates select="@*" mode="copy.literal.atts"/>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.before.recto</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.recto</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.before.verso</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.verso</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.separator</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+
+ <!-- If we're not importing a base stylesheet, output a default rule
+ for the recto- and verso-mode elements. (If we are importing a
+ base stylesheet, don't do this since the *-rules in the stylesheet
+ will totally override the rules that would otherwise be imported.)
+ -->
+
+ <xsl:if test="not(../@base-stylesheet)">
+ <!-- output a default rule for the recto-modes elements -->
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">*</xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.recto.mode</xsl:text>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:comment> if an element isn't found in this mode, </xsl:comment>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:comment> try the generic titlepage.mode </xsl:comment>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">.</xsl:attribute>
+ <xsl:attribute name="mode">titlepage.mode</xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+
+ <!-- output a default rule for the verso-modes elements -->
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">*</xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="@element"/>
+ <xsl:text>.titlepage.verso.mode</xsl:text>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:comment> if an element isn't found in this mode, </xsl:comment>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:comment> try the generic titlepage.mode </xsl:comment>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">.</xsl:attribute>
+ <xsl:attribute name="mode">titlepage.mode</xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ </xsl:if>
+
+ <!-- output default templates for each of the elements listed in -->
+ <!-- the titlepage-content. If a template is suppressed or forced -->
+ <!-- to be off, or has already been output, don't output it. -->
+ <xsl:for-each select="t:titlepage-content/*">
+ <xsl:variable name="thisnode" select="."/>
+ <xsl:if test="(not(@suppress-template) or @suppress-template='0')
+ and (not(@force) or @force='0')
+ and (not(preceding-sibling::*[name(.)=name($thisnode)]))">
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="../../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="../@side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:attribute>
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="{../../@wrapper}">
+ <xsl:attribute name="xsl:use-attribute-sets">
+ <xsl:value-of select="../../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="../@side"/>
+ <xsl:text>.style</xsl:text>
+ </xsl:attribute>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://www.w3.org/1999/XSL/Format'">
+ <xsl:attribute name="{local-name(.)}">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>&#xA;</xsl:text>
+
+ <xsl:choose>
+ <xsl:when test="@named-template">
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@named-template"/>
+ </xsl:attribute>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="xsl:with-param">
+ <xsl:attribute name="name">
+ <xsl:value-of select="local-name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">.</xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="../../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="../@side"/>
+ <xsl:text>.mode</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ </xsl:if>
+ </xsl:for-each>
+</xsl:template>
+
+<doc:template match="@*" mode="copy.literal.atts" xmlns="">
+<refpurpose>Copy t:titlepage attributes</refpurpose>
+
+<refdescription>
+<para>This template copies all of the <quote>other</quote> attributes
+from a <literal>t:titlepage</literal> element onto the specified
+wrapper.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="@*" mode="copy.literal.atts">
+ <xsl:choose>
+ <xsl:when test="name(.) = 'element'"></xsl:when>
+ <xsl:when test="name(.) = 'wrapper'"></xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="{name(.)}">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:titlepage-content">
+<refpurpose>Create templates for the content of one side of a title page</refpurpose>
+
+<refdescription>
+<para>The title page content, that is, the elements from the source
+document that are rendered on the title page, can be controlled independently
+for the recto and verso sides of the title page.</para>
+
+<para>The <literal>t:titlepage-content</literal> element has two attributes:
+
+<variablelist>
+<varlistentry><term>side</term>
+<listitem><para>Identifies the side of the page to which this title
+page content applies. The
+<sgmltag class="attribute">side</sgmltag> attribute is required and
+must be set to either
+<quote><literal>recto</literal></quote> or
+<quote><literal>verso</literal></quote>. In addition, you must specify
+exactly one <literal>t:titlepage-content</literal> for each side
+within each <literal>t:titlepage</literal>.</para>
+</listitem>
+</varlistentry>
+<varlistentry><term>order</term>
+<listitem><para>Indicates how the order of the elements presented on
+the title page is determined. If the
+<sgmltag class="attribute">order</sgmltag> is
+<quote><literal>document</literal></quote>, the elements are presented
+in document order. Otherwise (if the
+<sgmltag class="attribute">order</sgmltag> is
+<quote><literal>stylesheet</literal></quote>), the elements are presented
+in the order that they appear in the template (and consequently in
+the stylesheet).</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<para>The content of a <literal>t:titlepage-content</literal> element is
+a list of element names. These names should be unqualified. They identify
+the elements in the source document that should appear on the title page.
+</para>
+
+<para>Each element may have a single attribute:
+<sgmltag class="attribute">predicate</sgmltag>. The value of this
+attribute is used as a predicate for the expression that matches
+the element on which it occurs.</para>
+
+<para>In other words, to put only the first three authors on the
+recto-side of a title
+page, you could specify:
+
+<screen><![CDATA[
+ <t:titlepage-contents side="recto">
+ <!-- other titlepage elements -->
+ <author predicate="[count(previous-sibling::author)<2]"/>
+ <!-- other titlepage elements -->
+ </t:titlepage-contents>
+]]></screen>
+</para>
+
+<para>Usually, the elements so named are empty. But it is possible to
+make one level of selection within them. Suppose that you want to
+process <literal>authorgroup</literal> elements on the title page, but
+you want to select only proper authors, editors, or corporate authors,
+not collaborators or other credited authors.</para>
+
+<para>In that case, you can put a <literal>t:or</literal> group inside
+the <literal>authorgroup</literal> element:
+
+<screen><![CDATA[
+ <t:titlepage-contents side="recto">
+ <!-- other titlepage elements -->
+ <authorgroup>
+ <t:or>
+ <author/>
+ <editor/>
+ <corpauthor/>
+ </t:or>
+ </authorgroup>
+ <!-- other titlepage elements -->
+ </t:titlepage-contents>
+]]></screen>
+</para>
+
+<para>This will have the effect of automatically generating a template
+for processing <literal>authorgroup</literal>s in the title page mode,
+selecting only the specified children. If you need more complex processing,
+you'll have to construct the templates by hand.</para>
+
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:titlepage-content">
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="@side='recto' or @side='verso'">
+ <xsl:value-of select="@side"/>
+ </xsl:when>
+ <xsl:when test="@side">
+ <xsl:message terminate="yes">
+ <xsl:text>Illegal value specified for @side </xsl:text>
+ <xsl:text>on t:titlepage-content: </xsl:text>
+ <xsl:value-of select="@side"/>
+ </xsl:message>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>The @side attribute is required on </xsl:text>
+ <xsl:text>t:titlepage-content.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ </xsl:attribute>
+
+ <xsl:choose>
+ <!-- if document order is selected, make a huge select statement
+ on a single xsl:apply-templates to pick out the right elements
+ for the title page. -->
+ <xsl:when test="@order='document'">
+ <xsl:if test="count(child::*)&gt;0">
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:apply-templates mode="document.order"/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:when>
+
+ <!-- otherwise, select each of the elements in the specified order -->
+ <xsl:otherwise>
+ <xsl:apply-templates mode="stylesheet.order"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ <xsl:apply-templates mode="titlepage.specialrules"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:titlepage-separator">
+<refpurpose>Create templates for the separator</refpurpose>
+
+<refdescription>
+<para>The title page is separated from the content which follows it by
+the markup specified in the <literal>t:titlepage-separator</literal>
+element.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:titlepage-separator">
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="../@element"/>
+ <xsl:text>.titlepage.separator</xsl:text>
+ </xsl:attribute>
+
+ <xsl:apply-templates mode="copy"/>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:titlepage-before">
+<refpurpose>Create templates for what precedes a title page</refpurpose>
+
+<refdescription>
+<para>Each side of the title page is preceded by the markup specified
+in the <literal>t:titlepage-before</literal> element for that
+side.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:titlepage-before">
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="../@element"/>
+ <xsl:text>.titlepage.before.</xsl:text>
+ <xsl:value-of select="@side"/>
+ </xsl:attribute>
+
+ <xsl:apply-templates mode="copy"/>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="*" mode="copy" xmlns="">
+<refpurpose>Copy elements</refpurpose>
+
+<refdescription>
+<para>This template simply copies the elements that it applies to
+straight through into the result tree.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="*" mode="copy">
+ <xsl:element name="{name(.)}">
+ <xsl:apply-templates select="@*" mode="copy"/>
+ <xsl:apply-templates mode="copy"/>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="@*" mode="copy" xmlns="">
+<refpurpose>Copy attributes</refpurpose>
+
+<refdescription>
+<para>This template simply copies the attributes that it applies to
+straight through into the result tree.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="@*" mode="copy">
+ <xsl:attribute name="{name(.)}">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="*" mode="document.order" xmlns="">
+<refpurpose>Create rules to process titlepage elements in document order</refpurpose>
+
+<refdescription>
+<para>This template is called to process all of the children of the
+<literal>t:titlepage-content</literal> element. It creates the hairy
+select expression necessary to process each of those elements in
+the title page.</para>
+
+<para>Note that this template automatically handles the case where
+some DocBook elements, like title and subtitle, can occur both inside
+the *info elements where metadata is usually stored and outside.
+</para>
+
+<para>It also automatically calculates the name for the *info container
+and handles elements that have historically had containers with different
+names.</para>
+
+</refdescription>
+</doc:template>
+
+<xsl:template match="*" mode="document.order">
+ <xsl:variable name="docinfo">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>info</xsl:text>
+ </xsl:variable>
+
+ <xsl:variable name="altinfo">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage/@element='article'">
+ <xsl:text>artheader</xsl:text>
+ </xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='section'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect1'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect2'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect3'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect4'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect5'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='book'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='set'"></xsl:when>
+ <xsl:otherwise>docinfo</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage-content/@side">
+ <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>recto</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:if test="preceding-sibling::*">
+ <xsl:text>|</xsl:text>
+ </xsl:if>
+
+ <xsl:value-of select="$docinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+
+ <xsl:if test="$altinfo != ''">
+ <xsl:text>|</xsl:text>
+ <xsl:value-of select="$altinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:if test="local-name(.) = 'title'
+ or local-name(.) = 'subtitle'
+ or local-name(.) = 'titleabbrev'">
+ <xsl:text>|</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="*" mode="document.order" xmlns="">
+<refpurpose>Create rules to process titlepage elements in stylesheet order</refpurpose>
+
+<refdescription>
+<para>This template is called to process all of the children of the
+<literal>t:titlepage-content</literal> element. It creates the set
+of <literal>xsl:apply-templates</literal> elements necessary
+process each of those elements in the title page.</para>
+
+<para>Note that this template automatically handles the case where
+some DocBook elements, like title and subtitle, can occur both inside
+the *info elements where metadata is usually stored and outside.
+</para>
+
+<para>It also automatically calculates the name for the *info container
+and handles elements that have historically had containers with different
+names.</para>
+
+</refdescription>
+</doc:template>
+
+<xsl:template match="*" mode="stylesheet.order">
+ <xsl:variable name="docinfo">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>info</xsl:text>
+ </xsl:variable>
+
+ <xsl:variable name="altinfo">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage/@element='article'">
+ <xsl:text>artheader</xsl:text>
+ </xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='section'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect1'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect2'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect3'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect4'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='sect5'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='book'"></xsl:when>
+ <xsl:when test="ancestor::t:titlepage/@element='set'"></xsl:when>
+ <xsl:otherwise>docinfo</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage-content/@side">
+ <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+ </xsl:when>
+ <xsl:otherwise>recto</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:text>&#xA; </xsl:text>
+
+ <xsl:choose>
+ <xsl:when test="@force and @force != '0'">
+ <xsl:choose>
+ <xsl:when test="@named-template">
+ <xsl:element name="{../../@wrapper}">
+ <xsl:attribute name="xsl:use-attribute-sets">
+ <xsl:value-of select="../../@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="../@side"/>
+ <xsl:text>.style</xsl:text>
+ </xsl:attribute>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://www.w3.org/1999/XSL/Format'">
+ <xsl:attribute name="{local-name(.)}">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@named-template"/>
+ </xsl:attribute>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+ <xsl:text>&#xA;</xsl:text>
+ <xsl:element name="xsl:with-param">
+ <xsl:attribute name="name">
+ <xsl:value-of select="local-name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Force can only be used with named-templates.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'title'
+ or local-name(.) = 'subtitle'
+ or local-name(.) = 'titleabbrev'">
+ <!-- the title, subtitle, and titleabbrev elements are special -->
+ <xsl:element name="xsl:choose">
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">
+ <xsl:value-of select="$docinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="$docinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ </xsl:element>
+
+ <xsl:if test="$altinfo != ''">
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">
+ <xsl:value-of select="$altinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="$altinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ </xsl:element>
+ </xsl:if>
+
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ </xsl:element>
+ <xsl:text>&#xA; </xsl:text>
+ </xsl:element>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+
+ <!-- first take care of the $docinfo version -->
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="$docinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:attribute>
+ </xsl:element>
+
+ <!-- then take care of the $altinfo version -->
+ <xsl:if test="$altinfo != ''">
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="$altinfo"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="name(.)"/>
+ <xsl:if test="@predicate">
+ <xsl:value-of select="@predicate"/>
+ </xsl:if>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="*" mode="titlepage.specialrules" xmlns="">
+<refpurpose>Create templates for special rules</refpurpose>
+
+<refdescription>
+<para>This template is called to process all of the descendants of the
+<literal>t:titlepage-content</literal> element that require special
+processing. At present, that's just <literal>t:or</literal> elements.
+</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="*" mode="titlepage.specialrules">
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage-content/@side">
+ <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+ </xsl:when>
+ <xsl:otherwise>recto</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="name(.)='t:or'">
+ <xsl:apply-templates select="*" mode="titlepage.specialrules"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="*"><!-- does this element have children? -->
+ <xsl:text>&#xA;&#xA;</xsl:text>
+ <xsl:element name="xsl:template">
+ <xsl:attribute name="match">
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="*" mode="titlepage.subrules"/>
+ <xsl:text>&#xA;</xsl:text>
+ </xsl:element>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="*" mode="titlepage.subrules" xmlns="">
+<refpurpose>Create template for individual special rules</refpurpose>
+
+<refdescription>
+<para>This template is called to process the children of special
+template elements.
+</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="*" mode="titlepage.subrules">
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage-content/@side">
+ <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+ </xsl:when>
+ <xsl:otherwise>recto</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">
+ <xsl:value-of select="name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:or" xmlns="">
+<refpurpose>Process the t:or special rule</refpurpose>
+
+<refdescription>
+<para>This template processes t:or.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:or">
+ <xsl:variable name="side">
+ <xsl:choose>
+ <xsl:when test="ancestor::t:titlepage-content/@side">
+ <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+ </xsl:when>
+ <xsl:otherwise>recto</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="mode">
+ <xsl:value-of select="ancestor::t:titlepage/@element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="$side"/>
+ <xsl:text>.auto.mode</xsl:text>
+ </xsl:variable>
+
+ <xsl:text>&#xA; </xsl:text>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">
+ <xsl:call-template name="element-or-list"/>
+ </xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="$mode"/>
+ </xsl:attribute>
+ </xsl:element>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template match="t:or" mode="titlepage.subrules" xmlns="">
+<refpurpose>Process the t:or special rule in
+titlepage.subrules mode</refpurpose>
+
+<refdescription>
+<para>The titlepage.subrules mode doesn't apply to t:or, so just
+reprocess this node in the normal mode.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template match="t:or" mode="titlepage.subrules">
+ <xsl:apply-templates select="."/><!-- use normal mode -->
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<doc:template name="element-or-list" xmlns="">
+<refpurpose>Construct the "or-list" used in the select attribute for
+special rules.</refpurpose>
+
+<refdescription>
+<para>Walk through each of the children of t:or, producing the
+text of the select attribute.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="element-or-list">
+ <xsl:param name="elements" select="*"/>
+ <xsl:param name="element.count" select="count($elements)"/>
+ <xsl:param name="count" select="1"/>
+ <xsl:param name="orlist"></xsl:param>
+
+ <xsl:choose>
+ <xsl:when test="$count>$element.count">
+ <xsl:value-of select="$orlist"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="element-or-list">
+ <xsl:with-param name="elements" select="$elements"/>
+ <xsl:with-param name="element.count" select="$element.count"/>
+ <xsl:with-param name="count" select="$count+1"/>
+ <xsl:with-param name="orlist">
+ <xsl:value-of select="$orlist"/>
+ <xsl:if test="not($orlist='')">|</xsl:if>
+ <xsl:value-of select="name($elements[position()=$count])"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+</xsl:stylesheet>
diff --git a/tests/docbook/xhtml/ChangeLog b/tests/docbook/xhtml/ChangeLog
index 5267eff5..4d41248b 100644
--- a/tests/docbook/xhtml/ChangeLog
+++ b/tests/docbook/xhtml/ChangeLog
@@ -1,4 +1,8 @@
-2000-10-09 Norman Walsh <ndw@nwalsh.com>
+2001-04-03 Norman Walsh <nwalsh@users.sourceforge.net>
- * LostLog, docbook.xsl, xtchunk.xsl: New file.
+ * chunk.xsl, docbook.xsl, xtchunk.xsl: Support MathML and chunking properly
+
+2001-04-02 Norman Walsh <nwalsh@users.sourceforge.net>
+
+ * docbook.xsl, xtchunk.xsl: New file.
diff --git a/tests/docbook/xhtml/chunk.xsl b/tests/docbook/xhtml/chunk.xsl
new file mode 100644
index 00000000..9b23ffb1
--- /dev/null
+++ b/tests/docbook/xhtml/chunk.xsl
@@ -0,0 +1,20 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
+ version="1.0">
+
+<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunk.xsl -->
+
+<xsl:import href="../html/chunk.xsl"/>
+
+<xsl:param name="html.ext" select="'.xhtm'"/>
+
+<xsl:output method="xml"/>
+
+<xsl:template match="mml:*">
+ <xsl:element name="{name(.)}">
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </xsl:element>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/docbook/xhtml/docbook.xsl b/tests/docbook/xhtml/docbook.xsl
index 31a55629..63c77e33 100644
--- a/tests/docbook/xhtml/docbook.xsl
+++ b/tests/docbook/xhtml/docbook.xsl
@@ -1,5 +1,6 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
version='1.0'>
<!-- ********************************************************************
@@ -17,4 +18,11 @@
<!-- this has to be last because of document order nonsense -->
<xsl:output method="xml"/>
+<xsl:template match="mml:*">
+ <xsl:element name="{name(.)}">
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </xsl:element>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/tests/docbook/xhtml/xtchunk.xsl b/tests/docbook/xhtml/xtchunk.xsl
index f1ca18d6..a136cdb5 100644
--- a/tests/docbook/xhtml/xtchunk.xsl
+++ b/tests/docbook/xhtml/xtchunk.xsl
@@ -1,135 +1,18 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:xt="http://www.jclark.com/xt"
- version="1.0"
- extension-element-prefixes="xt">
+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
+ version="1.0">
-<!-- NB: because xt:document doesn't seem to accept an AVT in its -->
-<!-- method attribute, some code has to be duplicated here. Check -->
-<!-- to make sure this code is in sync with ../html/xtchunk.xsl -->
-<!-- if you're having difficulties :-( -->
+<xsl:import href="../html/xtchunk.xsl"/>
-<xsl:include href="../html/xtchunk.xsl"/>
-
-<xsl:variable name="html.ext">.xhtm</xsl:variable>
+<xsl:param name="html.ext" select="'.xhtm'"/>
<xsl:output method="xml"/>
-<xsl:template match="set|book|part|preface|chapter|appendix
- |article
- |reference|refentry
- |sect1[position()>1]
- |section[position()>1 and name(parent::*) != 'section']
- |setindex
- |book/glossary|article/glossary
- |book/bibliography|article/bibliography
- |book/index|article/index
- |colophon">
- <xsl:variable name="prev"
- select="(preceding::book[1]
- |preceding::preface[1]
- |preceding::chapter[1]
- |preceding::appendix[1]
- |preceding::part[1]
- |preceding::reference[1]
- |preceding::refentry[1]
- |preceding::colophon[1]
- |preceding::sect1[position()=1
- and name(preceding-sibling::*[1]) = 'sect1']
- |preceding::section[position()=1
- and name(preceding-sibling::*[1]) = 'section'
- and name(parent::*) != 'section']
- |preceding::article[1]
- |preceding::bibliography[1]
- |preceding::glossary[1]
- |preceding::index[1]
- |preceding::setindex[1]
- |ancestor::set
- |ancestor::book[1]
- |ancestor::preface[1]
- |ancestor::chapter[1]
- |ancestor::appendix[1]
- |ancestor::part[1]
- |ancestor::reference[1]
- |ancestor::article[1])[last()]"/>
-
- <xsl:variable name="next"
- select="(following::book[1]
- |following::preface[1]
- |following::chapter[1]
- |following::appendix[1]
- |following::part[1]
- |following::reference[1]
- |following::refentry[1]
- |following::colophon[1]
- |following::sect1[1]
- |following::section[name(parent::*) != 'section']
- |following::bibliography[1]
- |following::glossary[1]
- |following::index[1]
- |following::article[1]
- |following::setindex[1]
- |descendant::book[1]
- |descendant::preface[1]
- |descendant::chapter[1]
- |descendant::appendix[1]
- |descendant::article[1]
- |descendant::bibliography[1]
- |descendant::glossary[1]
- |descendant::index[1]
- |descendant::colophon[1]
- |descendant::setindex[1]
- |descendant::part[1]
- |descendant::reference[1]
- |descendant::refentry[1]
- |descendant::sect1[2]
- |descendant::section[position()=2
- and name(parent::*) != 'section'])[1]"/>
-
- <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
- <xsl:variable name="chunkfn">
- <xsl:if test="$ischunk='1'">
- <xsl:apply-templates mode="chunk-filename" select="."/>
- </xsl:if>
- </xsl:variable>
-
- <xsl:if test="$ischunk='0'">
- <xsl:message>
- <xsl:text>Error </xsl:text>
- <xsl:value-of select="name(.)"/>
- <xsl:text> is not a chunk!</xsl:text>
- </xsl:message>
- </xsl:if>
-
- <xsl:message>
- <xsl:text>Writing </xsl:text>
- <xsl:value-of select="$chunkfn"/>
- <xsl:text> for </xsl:text>
- <xsl:value-of select="name(.)"/>
- </xsl:message>
-
- <xt:document method="html" href="{$chunkfn}">
- <html>
- <xsl:call-template name="html.head">
- <xsl:with-param name="prev" select="$prev"/>
- <xsl:with-param name="next" select="$next"/>
- </xsl:call-template>
-
- <body>
- <xsl:call-template name="header.navigation">
- <xsl:with-param name="prev" select="$prev"/>
- <xsl:with-param name="next" select="$next"/>
- </xsl:call-template>
-
-
- <xsl:apply-imports/>
-
- <xsl:call-template name="footer.navigation">
- <xsl:with-param name="prev" select="$prev"/>
- <xsl:with-param name="next" select="$next"/>
- </xsl:call-template>
- </body>
- </html>
- </xt:document>
+<xsl:template match="mml:*">
+ <xsl:element name="{name(.)}">
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </xsl:element>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet> \ No newline at end of file