From ef34e3d5861d89357da08d58dacb521279fceef6 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 10 Sep 2001 20:56:07 +0000 Subject: [PATCH] applied fix from #60143 and rebuilt the FO test outputs Daniel * libxslt/pattern.c tests/docbook/result/fo/*: applied fix from #60143 and rebuilt the FO test outputs Daniel --- ChangeLog | 5 + libxslt/pattern.c | 5 +- tests/docbook/result/fo/article.fo | 151 +- tests/docbook/result/fo/article2.fo | 12 +- tests/docbook/result/fo/article3.fo | 245 +-- tests/docbook/result/fo/bib.fo | 4 +- tests/docbook/result/fo/book.fo | 190 +- tests/docbook/result/fo/book2.fo | 912 ++++----- tests/docbook/result/fo/book3.fo | 10 +- tests/docbook/result/fo/callout.fo | 22 +- tests/docbook/result/fo/chunk.fo | 62 +- tests/docbook/result/fo/classsynop.fo | 2 +- tests/docbook/result/fo/condition.fo | 912 ++++----- tests/docbook/result/fo/docbook40.fo | 26 +- tests/docbook/result/fo/external.fo | 2 +- tests/docbook/result/fo/figtest.fo | 2 +- tests/docbook/result/fo/foottest.fo | 4 +- tests/docbook/result/fo/fotest.fo | 14 +- tests/docbook/result/fo/gdp-handbook.fo | 2304 +++++++++++----------- tests/docbook/result/fo/graphics.fo | 143 +- tests/docbook/result/fo/gtest.fo | 2 +- tests/docbook/result/fo/idxbook.fo | 89 +- tests/docbook/result/fo/kwrite.fo | 3176 +++++++++++++++---------------- tests/docbook/result/fo/multilingual.fo | 44 +- tests/docbook/result/fo/qa.fo | 1496 +++++++-------- tests/docbook/result/fo/qa2.fo | 32 +- tests/docbook/result/fo/sectest.fo | 250 ++- tests/docbook/result/fo/set.fo | 251 +-- tests/docbook/result/fo/table.fo | 8 +- tests/docbook/result/fo/test.fo | 2 +- 30 files changed, 4867 insertions(+), 5510 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cb76ed..8234673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 10 22:52:44 CEST 2001 Daniel Veillard + + * libxslt/pattern.c tests/docbook/result/fo/*: applied fix from + #60143 and rebuilt the FO test outputs + Mon Sep 10 19:38:54 CEST 2001 Daniel Veillard * libxslt/attributes.c libxslt/transform.c: fixed bug #59757 diff --git a/libxslt/pattern.c b/libxslt/pattern.c index 2d47974..3a5438b 100644 --- a/libxslt/pattern.c +++ b/libxslt/pattern.c @@ -381,7 +381,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp, case XSLT_OP_ROOT: if ((node->type == XML_DOCUMENT_NODE) || #ifdef LIBXML_DOCB_ENABLED - (node->type != XML_DOCB_DOCUMENT_NODE) || + (node->type == XML_DOCB_DOCUMENT_NODE) || #endif (node->type == XML_HTML_DOCUMENT_NODE)) continue; @@ -759,6 +759,9 @@ wrong_index: switch (node->type) { case XML_DOCUMENT_NODE: case XML_HTML_DOCUMENT_NODE: +#ifdef LIBXML_DOCB_ENABLED + case XML_DOCB_DOCUMENT_NODE: +#endif case XML_ELEMENT_NODE: case XML_CDATA_SECTION_NODE: case XML_PI_NODE: diff --git a/tests/docbook/result/fo/article.fo b/tests/docbook/result/fo/article.fo index 10ea186..4e93c70 100644 --- a/tests/docbook/result/fo/article.fo +++ b/tests/docbook/result/fo/article.fo @@ -81,7 +81,7 @@ - + @@ -138,8 +138,8 @@ This article is just a test. This article is just a test. This para contains an link to a figure. - - + + • @@ -147,7 +147,7 @@ figure. Test item. - + • @@ -155,7 +155,7 @@ figure. Test item. - + • @@ -164,8 +164,8 @@ figure. - - + + 1. @@ -173,7 +173,7 @@ figure. Test item. - + 2. @@ -181,7 +181,7 @@ figure. Test item. - + 3. @@ -196,125 +196,76 @@ 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. - - - - + + + + + First level section + - - + + - First level section + Second level section - - - - + + + + + Third level section + - - + + - Second level section + Fourth level section - - - - + + + + + Fifth level section (SI) + - - + + - Third level section + Sixth level section - - - - - - - - - - - Fourth level section - + + + + + Seventh level section - - - - - - - - - - - Fifth level section (SI) - - - - - - - - - - - - - - Sixth level section - - - - - - - - - - - - - - Seventh level section - - - - 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. This article is just a test. This article is just a test. - - - - - - - - - - - - - - - + + + + + + + + Appendix This is just a test. diff --git a/tests/docbook/result/fo/article2.fo b/tests/docbook/result/fo/article2.fo index 0dab92f..e1d621b 100644 --- a/tests/docbook/result/fo/article2.fo +++ b/tests/docbook/result/fo/article2.fo @@ -81,7 +81,7 @@ - + @@ -116,7 +116,7 @@ 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 is a test table @@ -225,8 +225,8 @@ This article is just a test. This article is just a test. - - + + term @@ -236,7 +236,7 @@ This article is just a test. This article is just a test. some text - + term2a, @@ -247,7 +247,7 @@ This article is just a test. This article is just a test. some text - + term3 diff --git a/tests/docbook/result/fo/article3.fo b/tests/docbook/result/fo/article3.fo index 04a2245..c691459 100644 --- a/tests/docbook/result/fo/article3.fo +++ b/tests/docbook/result/fo/article3.fo @@ -81,7 +81,7 @@ - + @@ -99,213 +99,136 @@ 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. - - - - + + + + + First level section + - - + + - First level section + Second level section - - - - + + + + + Third level section + - - + + - Second level section + Fourth level section - - - - - - - - - - - Third level section - + + + + + Fifth level section - - - - - - - - - - - Fourth level section - - - - - - - - - - - - - - Fifth level section - - - - This is just a test. - - - - - - - - - - - - - - + + This is just a test. + + + + + + + + + + Another Section + - - + + - Another Section + SimpleSect @ level 2 - - - - - SimpleSect @ level 2 - - + This is just a test. + + + + + + + Another Section - This is just a test. - - - - - - - - - + + - Another Section + Another Section - - - - - - - - - - - Another Section - - - - - - - - SimpleSect @ level 3 - - + + + + + SimpleSect @ level 3 - This is just a test. - - - - - - - - + + This is just a test. - - + + + + + + + Another Section + + + + - Another Section + Another Section - - - - + + + + + Another Section + - - + + - Another Section + SimpleSect @ level 4 - - - - - - - - - - - Another Section - - - - - - - - SimpleSect @ level 4 - - - - This is just a test. - - - - - - - + This is just a test. + + + + diff --git a/tests/docbook/result/fo/bib.fo b/tests/docbook/result/fo/bib.fo index 61d90e2..bbf8b1f 100644 --- a/tests/docbook/result/fo/bib.fo +++ b/tests/docbook/result/fo/bib.fo @@ -124,7 +124,7 @@ a lot of tweaking. It probably doesn't conform to any specific style. Books - + [AhoSethiUllman96] Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. Compilers, Principles, Techniques, and Tools. @@ -158,7 +158,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.O'Reilly & Associates, Inc. and The World Wide Web Consortium. Winter, 1996. - + [Abbrev] A Really Full BiblioEntry. Subtitle. diff --git a/tests/docbook/result/fo/book.fo b/tests/docbook/result/fo/book.fo index 1d7123f..bd0a71e 100644 --- a/tests/docbook/result/fo/book.fo +++ b/tests/docbook/result/fo/book.fo @@ -81,7 +81,7 @@ - + @@ -138,15 +138,15 @@ Some legal notice. Some legal notice. Some legal notice. Foreword - + - + I Part One Title - + @@ -156,37 +156,37 @@ Some legal notice. Some legal notice. Some legal notice. First Sect1 - + Second Sect1 - + Third Sect1 - + 2 First Chapter - + 3 Second Chapter - + 4 Third Chapter - + A First Appendix - + B Second Appendix - + @@ -216,7 +216,7 @@ Some legal notice. Some legal notice. Some legal notice. - + @@ -411,7 +411,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. - + @@ -426,7 +426,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. Just a test dedication. - + @@ -441,7 +441,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. This is a test paragraph. - + @@ -456,7 +456,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. This is a test preface. - + @@ -472,23 +472,16 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. PartIntro Title Partintro content[1][1] This is a footnote in a partintro.. - - - - - - - - - - - PartIntro Section - + + + + + PartIntro Section - PartIntros can actually have section content as well. - - + + PartIntros can actually have section content as well. + @@ -508,72 +501,51 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. Chapter 1. Section Tests - - - - - - - - - - - First Sect1 - + + + + + First Sect1 - Paragraph. - - Test Figure - This is a + + Paragraph. + + Test Figure + This is a ProgramListing - - - - - - - - - - - - - - Second Sect1 - + + + + + + + Second Sect1 - Paragraph. - - - - - - - - - - - - - Third Sect1 - + + Paragraph. + + + + + + Third Sect1 - Paragraph. - - Test Figure - This is a + + Paragraph. + + Test Figure + This is a ProgramListing - - - + + - + Chapter 2. First Chapter @@ -600,7 +572,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. - + Chapter 3. Second Chapter @@ -618,23 +590,23 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. This is a test paragraph. - - + + - - + + - + - - + + - - - + + + - + Chapter 4. Third Chapter @@ -654,7 +626,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. This is a test paragraph. - + Appendix A. First Appendix @@ -680,7 +652,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. - + Appendix B. Second Appendix @@ -698,18 +670,18 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah. This is just a test. - - + + - - + + - - + + - - - + + + diff --git a/tests/docbook/result/fo/book2.fo b/tests/docbook/result/fo/book2.fo index 64e13c2..bb9dfce 100644 --- a/tests/docbook/result/fo/book2.fo +++ b/tests/docbook/result/fo/book2.fo @@ -131,11 +131,11 @@ Preface Title - + I Part One Title - + @@ -154,22 +154,22 @@ a sect2 title - + a sect3 title - + a sect4 title - + a sect5 title - + @@ -182,22 +182,22 @@ another sect2 title - + another sect3 title - + another sect4 title - + another sect5 title - + @@ -214,37 +214,37 @@ 3 Inline Tests - + 4 Block Tests - + 5 List Tests - + 6 Table Tests - + 7 Index Term Tests - + Index Term Sect 1 - + Index Term Sect 2 - + Index Term Sect 3 - + @@ -256,20 +256,20 @@ 8 CmdSynopsis Tests - + 9 FuncSynopsis Tests - + 10 Callout Tests - + III A Reference Part - + @@ -279,11 +279,11 @@ RefEntryTitle - + Chop - + @@ -293,32 +293,32 @@ B A Very Long Appendix - + a sect1 title - + a sect2 title - + a sect3 title - + a sect4 title - + a sect5 title - + @@ -326,27 +326,27 @@ another sect1 title - + another sect2 title - + another sect3 title - + another sect4 title - + another sect5 title - + @@ -354,11 +354,11 @@ another sect1 title - + another sect1 title - + @@ -375,7 +375,7 @@ An Index with a Title - + @@ -418,7 +418,7 @@ 2 chop() example - + @@ -436,7 +436,7 @@ - + @@ -454,7 +454,7 @@ of the dedication. This is the third para of the dedication. - + @@ -471,7 +471,7 @@ of the dedication. This is the third para of the preface. - + @@ -487,23 +487,16 @@ of the dedication. PartIntro Title Partintro content[1][1] This is a footnote in a partintro.. - - - - - - - - - - - PartIntro Section - + + + + + PartIntro Section - PartIntros can actually have section content as well. - - + + PartIntros can actually have section content as well. + @@ -648,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. - - + + - - + + - - + + - - - + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -678,63 +671,71 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect1 title - + + + + + a sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - + + + - - - + + + - - - - - - - some text. some text. some text. some text. some text. some text. + + + + + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - some text. some text. some text. some text. some text. some text. + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. 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 sect2 title + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect2 title + a sect3 title @@ -743,12 +744,22 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. 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 sect3 title + a sect4 title @@ -757,22 +768,12 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. 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 sect4 title + a sect5 title @@ -782,59 +783,53 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect5 title - - - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - + + + + + + + another sect1 title + - - + a sect1 subtitle + + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. + + + + + - another sect1 title + another sect2 title - a sect1 subtitle + a sect2 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - +some text. some text. some text. some text. some text. some text. some text. + - another sect2 title + another sect3 title - a sect2 subtitle + a sect3 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -842,14 +837,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect3 title + another sect4 title - a sect3 subtitle + a sect4 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -857,14 +852,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect4 title + another sect5 title - a sect4 subtitle + a sect5 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -872,74 +867,44 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - another sect5 title - - - a sect5 subtitle - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - - another sect1 title - + + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - another sect1 title - + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - + - + Chapter 3. Inline Tests @@ -956,7 +921,7 @@ some text. some text. some text. some text. some text. some text. some text. Chapter 3. Inline Tests - + @@ -1300,12 +1265,12 @@ Another footnote[2]. And here are a couple of index terms, as another test (of index terms, not inlines). - - + + - + Chapter 4. Block Tests @@ -1322,7 +1287,7 @@ index terms, not inlines). Chapter 4. Block Tests - + @@ -1384,7 +1349,7 @@ index terms, not inlines). - + @@ -1434,7 +1399,7 @@ index terms, not inlines). - + @@ -1443,52 +1408,52 @@ index terms, not inlines). Note - + Note Consider yourself noted. Second para. - + Note Consider yourself noted, simply. - + NoteTitle Consider yourself noted. Second para, with a title. - + Att Consider yourself noted, simply. With a title Important - + Important Consider yourself important. Tip - + Tip Consider yourself tipped. Warning - + Warning Consider yourself warned. Caution - + Caution Consider yourself cautioned. SimPara in Caution - + Simple Caution A simpler caution. - + @@ -1671,7 +1636,7 @@ literal - + Chapter 5. List Tests @@ -1688,7 +1653,7 @@ literal Chapter 5. List Tests - + @@ -1697,8 +1662,8 @@ literal Default Numeration - - + + 1. @@ -1706,7 +1671,7 @@ literal One - + 2. @@ -1716,7 +1681,7 @@ a program listing what happens? - + 3. @@ -1726,7 +1691,7 @@ a synopsis what happens? - + 4. @@ -1737,7 +1702,7 @@ a synopsis what happens? - + 5. @@ -1748,7 +1713,7 @@ Screen Here - + 6. @@ -1758,8 +1723,8 @@ Here Arabic Numeration - - + + 1. @@ -1767,7 +1732,7 @@ Here One - + 2. @@ -1775,7 +1740,7 @@ Here Two - + 3. @@ -1783,7 +1748,7 @@ Here Three - + 4. @@ -1793,8 +1758,8 @@ Here Arabic Numeration (Long) - - + + 1. @@ -1802,7 +1767,7 @@ Here One - + 2. @@ -1810,7 +1775,7 @@ Here Two - + 3. @@ -1818,7 +1783,7 @@ Here Three - + 4. @@ -1826,7 +1791,7 @@ Here Four - + 5. @@ -1834,7 +1799,7 @@ Here Five - + 6. @@ -1842,7 +1807,7 @@ Here Six - + 7. @@ -1850,7 +1815,7 @@ Here Seven - + 8. @@ -1858,7 +1823,7 @@ Here Eight - + 9. @@ -1866,7 +1831,7 @@ Here Nine - + 10. @@ -1874,7 +1839,7 @@ Here Ten - + 11. @@ -1884,8 +1849,8 @@ Here UpperAlpha Numeration - - + + 1. @@ -1893,7 +1858,7 @@ Here One - + 2. @@ -1901,7 +1866,7 @@ Here Two - + 3. @@ -1909,7 +1874,7 @@ Here Three - + 4. @@ -1919,8 +1884,8 @@ Here LowerAlpha Numeration - - + + 1. @@ -1928,7 +1893,7 @@ Here One - + 2. @@ -1936,7 +1901,7 @@ Here Two - + 3. @@ -1944,7 +1909,7 @@ Here Three - + 4. @@ -1954,8 +1919,8 @@ Here UpperRoman Numeration - - + + 1. @@ -1963,7 +1928,7 @@ Here One - + 2. @@ -1971,7 +1936,7 @@ Here Two - + 3. @@ -1979,7 +1944,7 @@ Here Three - + 4. @@ -1989,8 +1954,8 @@ Here LowerRoman Numeration - - + + 1. @@ -1998,7 +1963,7 @@ Here One - + 2. @@ -2006,7 +1971,7 @@ Here Two - + 3. @@ -2014,7 +1979,7 @@ Here Three - + 4. @@ -2025,11 +1990,11 @@ Here Continued First list: -1.One2.Two3.Three4.Four +1.One2.Two3.Three4.Four Second list: -1.Five2.Six3.Seven4.Eight5.Nine6.Ten +1.Five2.Six3.Seven4.Eight5.Nine6.Ten - + @@ -2038,8 +2003,8 @@ Here Default Presentation - - + + • @@ -2047,7 +2012,7 @@ Here One - + • @@ -2057,7 +2022,7 @@ a program listing what happens? - + • @@ -2065,7 +2030,7 @@ what happens? Two - + • @@ -2073,7 +2038,7 @@ what happens? Three - + • @@ -2083,8 +2048,8 @@ what happens? Block Elements in a List - - + + • @@ -2093,7 +2058,7 @@ what happens? Another para. - + • @@ -2101,7 +2066,7 @@ what happens? Two - + • @@ -2109,7 +2074,7 @@ what happens? Three - + • @@ -2119,8 +2084,8 @@ what happens? Alternate Mark and OverRide - - + + • @@ -2128,7 +2093,7 @@ what happens? TeX and LaTeX - + • @@ -2136,7 +2101,7 @@ what happens? Troff - + • @@ -2144,7 +2109,7 @@ what happens? Lout - + • @@ -2154,8 +2119,8 @@ what happens? No mark Presentation - - + + • @@ -2163,7 +2128,7 @@ what happens? One - + • @@ -2171,7 +2136,7 @@ what happens? Two - + • @@ -2179,7 +2144,7 @@ what happens? Three - + • @@ -2189,7 +2154,7 @@ what happens? - + @@ -2197,8 +2162,8 @@ what happens? - - + + Term1 @@ -2212,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. - + Term2 @@ -2226,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. - + Term3 @@ -2238,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. - - + + • @@ -2247,7 +2212,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. One - + • @@ -2255,7 +2220,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Two - + • @@ -2263,7 +2228,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Three - + • @@ -2279,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. - + Term4 @@ -2294,8 +2259,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + Another List @@ -2309,7 +2274,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. - + ProgramListing @@ -2328,7 +2293,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2416,7 +2381,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2424,8 +2389,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + • @@ -2434,7 +2399,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2443,7 +2408,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2452,7 +2417,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2461,7 +2426,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2470,7 +2435,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2479,8 +2444,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + 1. @@ -2489,7 +2454,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 2. @@ -2498,7 +2463,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 3. @@ -2507,7 +2472,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 4. @@ -2516,7 +2481,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 5. @@ -2525,7 +2490,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 6. @@ -2535,7 +2500,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2647,7 +2612,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + Chapter 6. Table Tests @@ -4499,7 +4464,7 @@ number - + Chapter 7. Index Term Tests @@ -4523,82 +4488,75 @@ number - - - - - - - - - - - Index Term Sect 1 - + + + + + Index Term Sect 1 - Test data. - + + Test data. + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - Index Term Sect 2 - + + + + + + Index Term Sect 2 - Test data. - + + Test data. + - - + + - - + + - - + + - - - - - - - Index Term Sect 3 - + + + + + + + Index Term Sect 3 - foo - - + foo + + @@ -4610,7 +4568,7 @@ number - + Chapter 8. CmdSynopsis Tests @@ -4641,7 +4599,7 @@ number cccp [-$] [-C] [-Dname [=definition]...] [-dD] [-dM] [-I directory...] [-H] [-I-] [-imacros file...] [-include file...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-Uname] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {infile | -} {outfile | -} - + Chapter 9. FuncSynopsis Tests @@ -4678,7 +4636,7 @@ number - + Chapter 10. Callout Tests @@ -4727,9 +4685,9 @@ while (@DIRS) { } exit; - + - + ❶ @@ -4737,7 +4695,7 @@ exit; The prologue handles embedding a Perl script in a DOS batch file. - + ❷ @@ -4746,7 +4704,7 @@ exit; file interpreter, skips over the body of the Perl script. - + ❸ @@ -4755,7 +4713,7 @@ file interpreter, skips over the body of the Perl script. fragments. - + ❹ @@ -4765,7 +4723,7 @@ utility. It is a Perl5 function. (Note that this callout area specifies both a line and a column.) - + ❺ @@ -4782,9 +4740,9 @@ there's a ❶callout in here. and there's another on the next line right here:❷ - + - + ❶ @@ -4793,7 +4751,7 @@ right here:❷ Second para in first callout. - + ❷ @@ -4807,7 +4765,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Third para in second callout. - + ❶❷ @@ -4819,7 +4777,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -4837,7 +4795,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -4880,7 +4838,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -4892,7 +4850,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Description Returns the argument string without trailing whitespace. - chop() example$trimmed = Chop($line); + chop() example$trimmed = Chop($line); @@ -4917,7 +4875,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah. - + Appendix B. A Very Long Appendix @@ -5164,17 +5122,25 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. 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 sect1 title + - - + + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. 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 sect1 title + a sect2 title @@ -5184,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. - + - a sect2 title + a sect3 title @@ -5198,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. - + - a sect3 title + a sect4 title @@ -5212,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. - + - a sect4 title + a sect5 title @@ -5226,40 +5192,34 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect5 title - - - - some text. some text. some text. some text. some text. some text. + + + + + + + + + + another sect1 title + + + a sect1 subtitle + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - + - another sect1 title + another sect2 title - a sect1 subtitle + a sect2 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5267,14 +5227,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect2 title + another sect3 title - a sect2 subtitle + a sect3 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5282,14 +5242,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect3 title + another sect4 title - a sect3 subtitle + a sect4 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5297,14 +5257,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect4 title + another sect5 title - a sect4 subtitle + a sect5 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5312,71 +5272,41 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - another sect5 title - - - a sect5 subtitle - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - - another sect1 title - + + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - another sect1 title - + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - + @@ -5395,7 +5325,7 @@ some text. some text. some text. some text. some text. some text. some text. Books - + [AhoSethiUllman96] Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. Compilers, Principles, Techniques, and Tools. @@ -5429,7 +5359,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.O'Reilly & Associates, Inc. and The World Wide Web Consortium. Winter, 1996. - + [Abbrev] A Really Full BiblioEntry. Subtitle. @@ -5535,7 +5465,7 @@ USA. S - + SGML @@ -5573,7 +5503,7 @@ USA. a formal parathis is a formal paragraph. - + diff --git a/tests/docbook/result/fo/book3.fo b/tests/docbook/result/fo/book3.fo index 889f012..b673492 100644 --- a/tests/docbook/result/fo/book3.fo +++ b/tests/docbook/result/fo/book3.fo @@ -143,7 +143,7 @@ Index - + @@ -164,7 +164,7 @@ a lot of tweaking. It probably doesn't conform to any specific style. Books - + [AhoSethiUllman96] Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. Compilers, Principles, Techniques, and Tools. @@ -191,7 +191,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.O'Reilly & Associates, Inc. and The World Wide Web Consortium. Winter, 1996. - + [Abbrev] A Really Full BiblioEntry. Subtitle. @@ -293,7 +293,7 @@ USA. S - + SGML @@ -331,7 +331,7 @@ USA. a formal parathis is a formal paragraph. - + diff --git a/tests/docbook/result/fo/callout.fo b/tests/docbook/result/fo/callout.fo index d21b049..95e7d9c 100644 --- a/tests/docbook/result/fo/callout.fo +++ b/tests/docbook/result/fo/callout.fo @@ -96,9 +96,9 @@ - - - + + + DSSSL doesn't have any construct that resembles the for loop that occurs in most imperative languages like C @@ -113,9 +113,9 @@ Loops in DSSSL use a special form of ❸(if (> count 10) ❹#t (❺loopvar ❻(+ count 1)))) - + - + ❶ @@ -125,20 +125,20 @@ initial value, immediately after the let - + ❷ - + Any number of additional local variables can be defined after the loop variable, just as they can in any other let expression. - + ❸ @@ -147,7 +147,7 @@ the loop variable, just as they can in any other test in it. - + ❹ @@ -155,7 +155,7 @@ test in it. This is the value that will be returned. - + ❺ @@ -164,7 +164,7 @@ test in it. it was a function name. - + ❻ diff --git a/tests/docbook/result/fo/chunk.fo b/tests/docbook/result/fo/chunk.fo index 51ae643..aaa3b88 100644 --- a/tests/docbook/result/fo/chunk.fo +++ b/tests/docbook/result/fo/chunk.fo @@ -81,7 +81,7 @@ - + @@ -119,11 +119,11 @@ First sect1 - + Second sect1 - + @@ -132,7 +132,7 @@ 3 Third Chapter - + A First Appendix @@ -140,7 +140,7 @@ B Second Appendix - + @@ -160,7 +160,7 @@ Just a test. - + @@ -219,40 +219,26 @@ Appendix - - - - - - - - - - - First sect1 - + + + + + First sect1 - ... - - - - - - - - - - - - - Second sect1 - + + ... + + + + + + Second sect1 - ... - - + + ... + @@ -275,7 +261,7 @@ This is a test paragraph. - + Chapter 3. Third Chapter @@ -365,7 +351,7 @@ This makes the appendix long. This makes the appendix long. This makes the appendix long. This makes the appendix long. - + Appendix B. Second Appendix diff --git a/tests/docbook/result/fo/classsynop.fo b/tests/docbook/result/fo/classsynop.fo index 5fb80ee..cde513c 100644 --- a/tests/docbook/result/fo/classsynop.fo +++ b/tests/docbook/result/fo/classsynop.fo @@ -81,7 +81,7 @@ - + Chapter 1. Class Synopses diff --git a/tests/docbook/result/fo/condition.fo b/tests/docbook/result/fo/condition.fo index bbef5db..acae98c 100644 --- a/tests/docbook/result/fo/condition.fo +++ b/tests/docbook/result/fo/condition.fo @@ -131,11 +131,11 @@ Preface Title - + I Part One Title - + @@ -154,22 +154,22 @@ a sect2 title - + a sect3 title - + a sect4 title - + a sect5 title - + @@ -182,22 +182,22 @@ another sect2 title - + another sect3 title - + another sect4 title - + another sect5 title - + @@ -214,37 +214,37 @@ 3 Inline Tests - + 4 Block Tests - + 5 List Tests - + 6 Table Tests - + 7 Index Term Tests - + Index Term Sect 1 - + Index Term Sect 2 - + Index Term Sect 3 - + @@ -256,20 +256,20 @@ 8 CmdSynopsis Tests - + 9 FuncSynopsis Tests - + 10 Callout Tests - + III A Reference Part - + @@ -279,11 +279,11 @@ RefEntryTitle - + Chop - + @@ -293,32 +293,32 @@ B A Very Long Appendix - + a sect1 title - + a sect2 title - + a sect3 title - + a sect4 title - + a sect5 title - + @@ -326,27 +326,27 @@ another sect1 title - + another sect2 title - + another sect3 title - + another sect4 title - + another sect5 title - + @@ -354,11 +354,11 @@ another sect1 title - + another sect1 title - + @@ -375,7 +375,7 @@ An Index with a Title - + @@ -422,7 +422,7 @@ 2 chop() example - + @@ -440,7 +440,7 @@ - + @@ -458,7 +458,7 @@ of the dedication. This is the third para of the dedication. - + @@ -475,7 +475,7 @@ of the dedication. This is the third para of the preface. - + @@ -491,23 +491,16 @@ of the dedication. PartIntro Title Partintro content[1][1] This is a footnote in a partintro.. - - - - - - - - - - - PartIntro Section - + + + + + PartIntro Section - PartIntros can actually have section content as well. - - + + PartIntros can actually have section content as well. + @@ -652,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. - - + + - - + + - - + + - - - + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -682,63 +675,71 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect1 title - + + + + + a sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - + + + - - - + + + - - - - - - - some text. some text. some text. some text. some text. some text. + + + + + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - some text. some text. some text. some text. some text. some text. + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. 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 sect2 title + + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect2 title + a sect3 title @@ -747,12 +748,22 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. 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 sect3 title + a sect4 title @@ -761,22 +772,12 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. 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 sect4 title + a sect5 title @@ -786,59 +787,53 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect5 title - - - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - + + + + + + + another sect1 title + - - + a sect1 subtitle + + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. + + + + + - another sect1 title + another sect2 title - a sect1 subtitle + a sect2 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - +some text. some text. some text. some text. some text. some text. some text. + - another sect2 title + another sect3 title - a sect2 subtitle + a sect3 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -846,14 +841,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect3 title + another sect4 title - a sect3 subtitle + a sect4 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -861,14 +856,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect4 title + another sect5 title - a sect4 subtitle + a sect5 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -876,74 +871,44 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - another sect5 title - - - a sect5 subtitle - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - - another sect1 title - + + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - another sect1 title - + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - + - + Chapter 3. Inline Tests @@ -960,7 +925,7 @@ some text. some text. some text. some text. some text. some text. some text. Chapter 3. Inline Tests - + @@ -1304,12 +1269,12 @@ Another footnote[2]. And here are a couple of index terms, as another test (of index terms, not inlines). - - + + - + Chapter 4. Block Tests @@ -1326,7 +1291,7 @@ index terms, not inlines). Chapter 4. Block Tests - + @@ -1388,7 +1353,7 @@ index terms, not inlines). - + @@ -1438,7 +1403,7 @@ index terms, not inlines). - + @@ -1447,52 +1412,52 @@ index terms, not inlines). Note - + Note Consider yourself noted. Second para. - + Note Consider yourself noted, simply. - + NoteTitle Consider yourself noted. Second para, with a title. - + Att Consider yourself noted, simply. With a title Important - + Important Consider yourself important. Tip - + Tip Consider yourself tipped. Warning - + Warning Consider yourself warned. Caution - + Caution Consider yourself cautioned. SimPara in Caution - + Simple Caution A simpler caution. - + @@ -1675,7 +1640,7 @@ literal - + Chapter 5. List Tests @@ -1692,7 +1657,7 @@ literal Chapter 5. List Tests - + @@ -1701,8 +1666,8 @@ literal Default Numeration - - + + 1. @@ -1710,7 +1675,7 @@ literal One - + 2. @@ -1720,7 +1685,7 @@ a program listing what happens? - + 3. @@ -1730,7 +1695,7 @@ a synopsis what happens? - + 4. @@ -1741,7 +1706,7 @@ a synopsis what happens? - + 5. @@ -1752,7 +1717,7 @@ Screen Here - + 6. @@ -1762,8 +1727,8 @@ Here Arabic Numeration - - + + 1. @@ -1771,7 +1736,7 @@ Here One - + 2. @@ -1779,7 +1744,7 @@ Here Two - + 3. @@ -1787,7 +1752,7 @@ Here Three - + 4. @@ -1797,8 +1762,8 @@ Here Arabic Numeration (Long) - - + + 1. @@ -1806,7 +1771,7 @@ Here One - + 2. @@ -1814,7 +1779,7 @@ Here Two - + 3. @@ -1822,7 +1787,7 @@ Here Three - + 4. @@ -1830,7 +1795,7 @@ Here Four - + 5. @@ -1838,7 +1803,7 @@ Here Five - + 6. @@ -1846,7 +1811,7 @@ Here Six - + 7. @@ -1854,7 +1819,7 @@ Here Seven - + 8. @@ -1862,7 +1827,7 @@ Here Eight - + 9. @@ -1870,7 +1835,7 @@ Here Nine - + 10. @@ -1878,7 +1843,7 @@ Here Ten - + 11. @@ -1888,8 +1853,8 @@ Here UpperAlpha Numeration - - + + 1. @@ -1897,7 +1862,7 @@ Here One - + 2. @@ -1905,7 +1870,7 @@ Here Two - + 3. @@ -1913,7 +1878,7 @@ Here Three - + 4. @@ -1923,8 +1888,8 @@ Here LowerAlpha Numeration - - + + 1. @@ -1932,7 +1897,7 @@ Here One - + 2. @@ -1940,7 +1905,7 @@ Here Two - + 3. @@ -1948,7 +1913,7 @@ Here Three - + 4. @@ -1958,8 +1923,8 @@ Here UpperRoman Numeration - - + + 1. @@ -1967,7 +1932,7 @@ Here One - + 2. @@ -1975,7 +1940,7 @@ Here Two - + 3. @@ -1983,7 +1948,7 @@ Here Three - + 4. @@ -1993,8 +1958,8 @@ Here LowerRoman Numeration - - + + 1. @@ -2002,7 +1967,7 @@ Here One - + 2. @@ -2010,7 +1975,7 @@ Here Two - + 3. @@ -2018,7 +1983,7 @@ Here Three - + 4. @@ -2029,11 +1994,11 @@ Here Continued First list: -1.One2.Two3.Three4.Four +1.One2.Two3.Three4.Four Second list: -1.Five2.Six3.Seven4.Eight5.Nine6.Ten +1.Five2.Six3.Seven4.Eight5.Nine6.Ten - + @@ -2042,8 +2007,8 @@ Here Default Presentation - - + + • @@ -2051,7 +2016,7 @@ Here One - + • @@ -2061,7 +2026,7 @@ a program listing what happens? - + • @@ -2069,7 +2034,7 @@ what happens? Two - + • @@ -2077,7 +2042,7 @@ what happens? Three - + • @@ -2087,8 +2052,8 @@ what happens? Block Elements in a List - - + + • @@ -2097,7 +2062,7 @@ what happens? Another para. - + • @@ -2105,7 +2070,7 @@ what happens? Two - + • @@ -2113,7 +2078,7 @@ what happens? Three - + • @@ -2123,8 +2088,8 @@ what happens? Alternate Mark and OverRide - - + + • @@ -2132,7 +2097,7 @@ what happens? TeX and LaTeX - + • @@ -2140,7 +2105,7 @@ what happens? Troff - + • @@ -2148,7 +2113,7 @@ what happens? Lout - + • @@ -2158,8 +2123,8 @@ what happens? No mark Presentation - - + + • @@ -2167,7 +2132,7 @@ what happens? One - + • @@ -2175,7 +2140,7 @@ what happens? Two - + • @@ -2183,7 +2148,7 @@ what happens? Three - + • @@ -2193,7 +2158,7 @@ what happens? - + @@ -2201,8 +2166,8 @@ what happens? - - + + Term1 @@ -2216,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. - + Term2 @@ -2230,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. - + Term3 @@ -2242,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. - - + + • @@ -2251,7 +2216,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. One - + • @@ -2259,7 +2224,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Two - + • @@ -2267,7 +2232,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Three - + • @@ -2283,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. - + Term4 @@ -2298,8 +2263,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + Another List @@ -2313,7 +2278,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. - + ProgramListing @@ -2332,7 +2297,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2420,7 +2385,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2428,8 +2393,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + • @@ -2438,7 +2403,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2447,7 +2412,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2456,7 +2421,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2465,7 +2430,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2474,7 +2439,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + • @@ -2483,8 +2448,8 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - - + + 1. @@ -2493,7 +2458,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 2. @@ -2502,7 +2467,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 3. @@ -2511,7 +2476,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 4. @@ -2520,7 +2485,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 5. @@ -2529,7 +2494,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Second para - + 6. @@ -2539,7 +2504,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -2651,7 +2616,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + Chapter 6. Table Tests @@ -4612,7 +4577,7 @@ number - + Chapter 7. Index Term Tests @@ -4636,82 +4601,75 @@ number - - - - - - - - - - - Index Term Sect 1 - + + + + + Index Term Sect 1 - Test data. - + + Test data. + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - Index Term Sect 2 - + + + + + + Index Term Sect 2 - Test data. - + + Test data. + - - + + - - + + - - + + - - - - - - - Index Term Sect 3 - + + + + + + + Index Term Sect 3 - foo - - + foo + + @@ -4723,7 +4681,7 @@ number - + Chapter 8. CmdSynopsis Tests @@ -4754,7 +4712,7 @@ number cccp [-$] [-C] [-Dname [=definition]...] [-dD] [-dM] [-I directory...] [-H] [-I-] [-imacros file...] [-include file...] [-lang-c | -lang-c++ | -lang-objc] [-lint] [-M | -MD | -MM | -MMD] [-nostdinc] [-P] [-pedantic] [-pedantic-errors] [-trigraphs] [-Uname] [-undef] [-Wtrigraphs] [-Wcomment] [-Wall] [-Wtraditional] {infile | -} {outfile | -} - + Chapter 9. FuncSynopsis Tests @@ -4791,7 +4749,7 @@ number - + Chapter 10. Callout Tests @@ -4840,9 +4798,9 @@ while (@DIRS) { } exit; - + - + ❶ @@ -4850,7 +4808,7 @@ exit; The prologue handles embedding a Perl script in a DOS batch file. - + ❷ @@ -4859,7 +4817,7 @@ exit; file interpreter, skips over the body of the Perl script. - + ❸ @@ -4868,7 +4826,7 @@ file interpreter, skips over the body of the Perl script. fragments. - + ❹ @@ -4878,7 +4836,7 @@ utility. It is a Perl5 function. (Note that this callout area specifies both a line and a column.) - + ❺ @@ -4895,9 +4853,9 @@ there's a ❶callout in here. and there's another on the next line right here:❷ - + - + ❶ @@ -4906,7 +4864,7 @@ right here:❷ Second para in first callout. - + ❷ @@ -4920,7 +4878,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Third para in second callout. - + ❶❷ @@ -4932,7 +4890,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -4950,7 +4908,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -4993,7 +4951,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. - + @@ -5005,7 +4963,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Description Returns the argument string without trailing whitespace. - chop() example$trimmed = Chop($line); + chop() example$trimmed = Chop($line); @@ -5030,7 +4988,7 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah. - + Appendix B. A Very Long Appendix @@ -5277,17 +5235,25 @@ Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. Blah blah blah blah. 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 sect1 title + - - + + some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. some text. some text. some text. some text. some text. +some text. some text. 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 sect1 title + a sect2 title @@ -5297,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. - + - a sect2 title + a sect3 title @@ -5311,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. - + - a sect3 title + a sect4 title @@ -5325,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. - + - a sect4 title + a sect5 title @@ -5339,40 +5305,34 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. 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 sect5 title - - - - some text. some text. some text. some text. some text. some text. + + + + + + + + + + another sect1 title + + + a sect1 subtitle + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - + - another sect1 title + another sect2 title - a sect1 subtitle + a sect2 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5380,14 +5340,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect2 title + another sect3 title - a sect2 subtitle + a sect3 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5395,14 +5355,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect3 title + another sect4 title - a sect3 subtitle + a sect4 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5410,14 +5370,14 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - + - another sect4 title + another sect5 title - a sect4 subtitle + a sect5 subtitle some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. @@ -5425,71 +5385,41 @@ some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - another sect5 title - - - a sect5 subtitle - - some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. -some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - - another sect1 title - + + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - - - - - - - - - - - - another sect1 title - + + + + + + another sect1 title - some text. some text. some text. some text. some text. some text. + + some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. some text. - - + @@ -5508,7 +5438,7 @@ some text. some text. some text. some text. some text. some text. some text. Books - + [AhoSethiUllman96] Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. Compilers, Principles, Techniques, and Tools. @@ -5542,7 +5472,7 @@ a lot of tweaking. It probably doesn't conform to any specific style.O'Reilly & Associates, Inc. and The World Wide Web Consortium. Winter, 1996. - + [Abbrev] A Really Full BiblioEntry. Subtitle. @@ -5648,7 +5578,7 @@ USA. S - + SGML @@ -5686,7 +5616,7 @@ USA. a formal parathis is a formal paragraph. - + diff --git a/tests/docbook/result/fo/docbook40.fo b/tests/docbook/result/fo/docbook40.fo index 93157a2..7013444 100644 --- a/tests/docbook/result/fo/docbook40.fo +++ b/tests/docbook/result/fo/docbook40.fo @@ -81,7 +81,7 @@ - + @@ -115,16 +115,16 @@ included. 1 Block-level Markup - + 2 Inline markup - + - + Chapter 1. Block-level Markup @@ -160,8 +160,8 @@ included. Ordered and itemized lists can have titles: Itemized List - - + + • @@ -169,7 +169,7 @@ included. First thing - + • @@ -177,7 +177,7 @@ included. Second thing - + • @@ -187,8 +187,8 @@ included. Ordered List - - + + • @@ -196,7 +196,7 @@ included. First thing - + • @@ -204,7 +204,7 @@ included. Second thing - + • @@ -225,7 +225,7 @@ object-oriented programming language classes. Here's one example: <classsynopsis><ooclass><modifier>public</modifier>TextFileWriter</ooclass><ooclass>HandlerBase</ooclass><fieldsynopsis><modifier>private</modifier>Writerwriter</fieldsynopsis><fieldsynopsis><modifier>public</modifier>StringwriterName<initializer>"MyWriter"</initializer></fieldsynopsis><methodsynopsis><modifier>static</modifier><modifier>public</modifier>();write<methodparam>ResultTreeFragmentfrag</methodparam><methodparam>Stringfile</methodparam>SAXException</methodsynopsis></classsynopsis> - + Chapter 2. Inline markup diff --git a/tests/docbook/result/fo/external.fo b/tests/docbook/result/fo/external.fo index d8c412b..0557706 100644 --- a/tests/docbook/result/fo/external.fo +++ b/tests/docbook/result/fo/external.fo @@ -81,7 +81,7 @@ - + diff --git a/tests/docbook/result/fo/figtest.fo b/tests/docbook/result/fo/figtest.fo index 43441ac..0f152c0 100644 --- a/tests/docbook/result/fo/figtest.fo +++ b/tests/docbook/result/fo/figtest.fo @@ -81,7 +81,7 @@ - + diff --git a/tests/docbook/result/fo/foottest.fo b/tests/docbook/result/fo/foottest.fo index c35057b..5aed94b 100644 --- a/tests/docbook/result/fo/foottest.fo +++ b/tests/docbook/result/fo/foottest.fo @@ -81,7 +81,7 @@ - + @@ -171,7 +171,7 @@ This article is just a test. This article is just a test. - + Appendix This is just a test. diff --git a/tests/docbook/result/fo/fotest.fo b/tests/docbook/result/fo/fotest.fo index 18db394..f14a77d 100644 --- a/tests/docbook/result/fo/fotest.fo +++ b/tests/docbook/result/fo/fotest.fo @@ -81,7 +81,7 @@ - + @@ -110,15 +110,15 @@ Foreword - + 1 First Chapter - + A First Appendix - + @@ -136,7 +136,7 @@ - + @@ -186,7 +186,7 @@ - + Chapter 1. First Chapter @@ -207,7 +207,7 @@ This is a test paragraph. - + Appendix A. First Appendix diff --git a/tests/docbook/result/fo/gdp-handbook.fo b/tests/docbook/result/fo/gdp-handbook.fo index 8d4dc81..84027db 100644 --- a/tests/docbook/result/fo/gdp-handbook.fo +++ b/tests/docbook/result/fo/gdp-handbook.fo @@ -155,37 +155,31 @@ - - - - + + + + + Introduction + - - + + - Introduction + The GNOME Documentation Project - + - The GNOME Documentation Project + Goals - - - - - Goals - - - - + 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 @@ -208,16 +202,16 @@ GNOME application documentation. Most GNOME applications have their own manual in addition to context sensitive help. - - - - - - Joining the GDP - + + + + + + Joining the GDP - + + 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 @@ -235,16 +229,16 @@ GDP Website [http://developer.gnome.org/projects/gdp]. - - - - - - Collaborating with the GDP - + + + + + + Collaborating with the GDP - + + 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 @@ -260,17 +254,17 @@ documentation for the application. The #docs IRC channel on irc.gnome.org is another option for contacting GDP members. - - - - - - Notation and Conventions - + + + + + + Notation and Conventions - + + This Handbook uses the following notation: /usr/bin Directory @@ -282,21 +276,21 @@ "Variable" text that can be replaced. Program or Doc CodeProgram or document code - - - - - - About This Handbook - + + + + + + About This Handbook - + + This Handbook is a guide for both writing documentation for GNOME components and applications and for properly binding and packaging documentation into GNOME applications. - + This Handbook, like all GNOME documentation, was written in DocBook(SGML) and is available in several formats including SGML, HTML, PostScript, and PDF. For the latest version, see @@ -305,40 +299,33 @@ Documentation [http://developer.gnome.org/projects/gdp/handbook.html]. Alternately, one may download it anonymously from GNOME CVS under gnome-docu/gdp. + + + + + + + Getting Started Writing GNOME Documentation + - - - - - - - - - + + - Getting Started Writing GNOME Documentation + Selecting A Document - + - Selecting A Document + Document Something You Know - - - - - Document Something You Know - - - - + The most frequently asked question of new contributors who join the GDP is "which document should I start with?". Because most people involved are volunteers, we do @@ -347,14 +334,14 @@ decide what about GNOME interests you most and find out if it has complete documents or not. - + It is also important to spend some time with GNOME to make sure you are familiar enough with it to be authoritative in your writing. The best way to do this is to just sit down and play with GNOME as much as possible before starting to write. - + The easiest way to get started is to improve existing documentation. If you notice some inaccuracies or omissions in the documentation, or you think that you can explain the @@ -362,16 +349,16 @@ author of the original documentation or to the GNOME documentation project at <docs@gnome.org>. - - - - - - The GNOME Documentation Status Table - + + + + + + The GNOME Documentation Status Table - + + The GDP Documentation Status Table (DocTable) (http://www.gnome.org/gdp/doctable/ [http://www.gnome.org/gdp/doctable/]) is a web page which tracks the status of all the various @@ -383,7 +370,7 @@ particular document, where the documentation can be found, and provides a forum for the discussion of each item. - + You should use the DocTable to help you select a documentation item which needs work done. Once you have selected an item to work on, please register @@ -395,36 +382,36 @@ people to make announcements and suggestions and to discuss issues in the comments section. - - Note - + + Note + Note that the information in the DocTable 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. - - - - - - Installing and Using DocBook - + + + + + + Installing and Using DocBook - + + 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. - - NOTE - + + NOTE + 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 @@ -433,16 +420,16 @@ document marked up will also be a great way for you to start learning DocBook. - - - - - - Installing DocBook - + + + + + + Installing DocBook - + + Download and install the following DocBook Tools packages [ftp://sourceware.cygnus.com:/pub/docbook-tools/]: jade, docbook, jadetex, sgml-common, and stylesheets. (RPM users should note that jade is platform dependent (eg. i386), while the other packages @@ -450,21 +437,21 @@ directory.) You can find more information on DocBook Tools here [ http://sourceware.cygnus.com/docbook-tools/]. - + 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. - - - - - - GDP Stylesheets - + + + + + + GDP Stylesheets - + + The GDP uses its own DocBook stylesheets. To use the GDP stylesheets, you should download the file gdp-both.dsl from the gnome-docu/gdp/dsssl module in @@ -477,22 +464,22 @@ gnome-doc-tools package [http://people.redhat.com/dcm/software.html] which will set up the stylesheets as well as the DTD discussed below. - - - - - - GDP DTD (PNG Image Support) - + + + + + + GDP DTD (PNG Image Support) - + + 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 http://www.gnu.org/philosophy/gif.html [http://www.gnu.org/philosophy/gif.html]. - + The current DocBook DTD(3.1) does not include support for embedding PNG images in your documents. Since the GDP uses many screenshots in its documentation, we use our own @@ -503,13 +490,13 @@ DTD's. To install the GDP custom DTD with PNG image support by hand: - - - - • - - - + + + + • + + + Download the GDP DocBook DTD for PNG support [http://www.labs.redhat.com/png/png-support.html] and install it where you keep your DTD's. (On Red Hat use /usr/lib/sgml/.) Note that @@ -517,14 +504,14 @@ <legalnotice> tag, so it is recommended that you use version 3.1 - - - - - • - - - + + + + + • + + + 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 @@ -538,50 +525,50 @@ PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.0//EN" "png-support- PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN" "png-support-3.1.dtd" - - - - + + + + Alternately, you can download and install the gnome-doc-tools package [http://people.redhat.com/dcm/software.html] which will set up the custom stylesheets and DTD for you. - + To include PNG files in your documents, you will need to indicate that you are using this special DTD. To do this, use the following headers: - + Articles: <!DOCTYPE Article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]> - + Books: <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]> - - - - - - Editors - + + + + + + Editors - + + 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 preserve sgml and produce the source in a format that is readable by everyone. - + Probably the two most popular editors available are Emacs and vi. These and other editors are @@ -592,16 +579,16 @@ V1.1//EN"[]> tools for the GDP. You may find out more about DocBook Tools in the section called “Installing DocBook”. - - - - - - Creating Something Useful with your Docs - + + + + + + Creating Something Useful with your Docs - + + 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 @@ -610,7 +597,7 @@ V1.1//EN"[]> Jade; Instead, you will use the scripts provided by DocBook Tools. - + To preview your DocBook document, it is easiest to convert it to html. If you have installed the DocBook tools described above, all you have to do is to run @@ -627,15 +614,15 @@ V1.1//EN"[]> creates the mydocument directory over, so you will have to copy the screenshots over each time. - + You can also convert your document to PostScript by running the command $db2ps mydocument.sgml, after which you can print out or view the resulting .ps file. - - NOTE - + + NOTE + 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 @@ -643,33 +630,33 @@ V1.1//EN"[]> to your docs. You can read more about the GDP stylesheets in the section called “GDP Stylesheets”. - - - - - - Images in DocBook Tools - + + + + + + Images in DocBook Tools - + + 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. - + The DocBook Tools scripts and applications are smart enough to know that when you are creating html you will be using PNG files and when you are creating Postscript you will be using EPS files (you must use EPS with Postscript). - + Thus, you should never explicitly include the extension of the image file, since DocBook Tools will automatically insert it for you. For example: - + <figure> <title>My Image</title> @@ -680,7 +667,7 @@ V1.1//EN"[]> </screenshot> </figure> - + You will notice in this example that the file myfile.png was referred to as simply myfile. Now when you run @@ -688,7 +675,7 @@ V1.1//EN"[]> automatically look for myfile.png in the directory. - + If you want to create PostScript ouput, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which @@ -699,68 +686,68 @@ V1.1//EN"[]> this package, you should already have img2eps on you system. - - - - - - Learning DocBook - + + + + + + Learning DocBook - + + There are many resources available to help you learn DocBook. The following resources on the web are useful for learning DocBook: - - - - • - - - + + + + • + + + http://www.docbook.org [http://www.docbook.org] - Norman Walsh's DocBook: The Definitive Guide. Online O'Reilly book on using DocBook. Contains an excellent element reference. May be too formal for a beginner. - - - - - • - - - + + + + + • + + + A Practical Introduction to DocBook [http://www.oswg.org/oswg-nightly/oswg/en_US.ISO_8859-1/articles/DocBook-Intro/docbook-intro/index.html] - The Open Source Writers Group's introduction to using DocBook. This is an excellent HOW-TO type article on getting started. - - - - - • - - - + + + + + • + + + Getting Going with DocBook: Notes for Hackers [http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro/docbook-intro.html] - 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. - - - - - • - - - + + + + + • + + + FreeBSD Documentation Project Primer for New Contributors [http://www.freebsd.org/tutorials/docproj-primer/] - FreeBSD documentation project @@ -769,45 +756,45 @@ V1.1//EN"[]> describes some custom extensions of DocBook; fortunately, they are clearly marked as such. - - - - + + + + Norman Walsh's book is also available in print. - + The following sections of this document are designed to help documentation authors write correct and consistent DocBook: - - - - • - - - + + + + • + + + the section called “DocBook Basics ” - Descriptions of commonly used DocBook tags. - - - - + + + + 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. - - - - - - GDP Document Templates - + + + + + + GDP Document Templates - + + Templates for various types of GNOME documents are found in Appendix A. Document Templates. They are kept in CVS in gnome-docu/gdp/templates. The easiest source to get them from @@ -816,16 +803,16 @@ V1.1//EN"[]> completely up-to-date with CVS and has a basic description of each file from CVS. + + + + + + Screenshots + + - - - - - Screenshots - - - - + Most GNOME documents will have screenshots of the particular applet, application, GNOME component, or widget being discussed. As discussed above in the section called “GDP DTD (PNG Image Support)” you @@ -834,15 +821,15 @@ V1.1//EN"[]> documentation. For the basic DocBook structure used to insert images in a document, see the section called “Images in DocBook Tools” above. - - - - - Screenshot Appearance - + + + + + Screenshot Appearance - + + For all screenshots of windows that typically have border decorations (e.g. applications and dialogs, but not applets in a panel), GDP standards dictate @@ -864,16 +851,16 @@ V1.1//EN"[]> requesting a GDP member reproduce these screenshots in the correct format and email them to you. - - - - - - Screenshot Tools - + + + + + + Screenshot Tools - + + There are many tools for taking screenshots in GNOME/Linux. Perhaps the most convenient is the Screen-Shooter Applet. Just click @@ -895,16 +882,16 @@ V1.1//EN"[]> screenshots, cropping screenshots, and converting image formats. - - - - - - Screenshot Files - + + + + + + Screenshot Files - + + Screenshots should be kept in the main documentation directory with your SGML file for applets, or should be kept in a directory called "figs" for application and other @@ -921,17 +908,17 @@ V1.1//EN"[]> images from their default location, as they are included directly into the output(PostScript of PDF) file. - - - - - - Application Bugs - + + + + + + Application Bugs - + + Documentation authors tend to investigate and test applets and applications more thoroughly than most users. Often documentation authors will discover one or @@ -945,16 +932,16 @@ V1.1//EN"[]> Buddy applet which is part of the gnome-applets package. - - - - - - Using CVS - + + + + + + Using CVS - + + 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 @@ -969,15 +956,15 @@ V1.1//EN"[]> GDP members may also be granted login CVS privileges so they may commit modified files directly to CVS. - - - - - Anonymous CVS - + + + + + Anonymous CVS - + + To anonymously check out documents from CVS, you must first log in. From the bash shell, you should set your CVSROOT shell variable with export @@ -991,16 +978,16 @@ V1.1//EN"[]> checked out and you would like to download any updates on the CVS server, use cvs -z3 update -Pd. - - - - - - Login CVS - + + + + + + Login CVS - If you have been given a + + 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 @@ -1028,16 +1015,16 @@ V1.1//EN"[]> filename, followed by the commit command. - - - - - - CVS Etiquette - + + + + + + CVS Etiquette - + + 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 @@ -1053,33 +1040,26 @@ V1.1//EN"[]> you should follow the indentation scheme used by the initial author. - - - - - - - + + + + + + + The GNOME Documentation System + - - + + - The GNOME Documentation System + The GNOME Help Browser - - - - - The GNOME Help Browser - - - - + At the core of the GNOME help system is the GNOME Help Browser. The Help Browser provides a unified interface to several @@ -1088,23 +1068,23 @@ V1.1//EN"[]> documents, GNOME application documentation, and other GNOME documents. - + The GNOME Help Browser works by searching standard directories for documents which are to be 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. - - - - - - The GNOME Help Browser (GNOME-2.0) - + + + + + + The GNOME Help Browser (GNOME-2.0) - In + + 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 @@ -1123,16 +1103,16 @@ V1.1//EN"[]> local file system. For more information on Nautilus, visit the #nautilus IRC channel on irc.gnome.org. - - - - - - Dynamic Document Synthesis(GNOME-2.0) - + + + + + + Dynamic Document Synthesis(GNOME-2.0) - + + 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 @@ -1141,29 +1121,29 @@ V1.1//EN"[]> for applets, will be combined in such a way that it appears to be a single document. - + 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. + + + + + + The GNOME Documentation Components + + - + - The GNOME Documentation Components + Application Manuals - - - - - Application Manuals - - - - + Every GNOME application should have an application manual. An application manual is a document specific to the particular application which explains the various windows @@ -1171,16 +1151,16 @@ V1.1//EN"[]> typically use screenshots (PNG format) for clarity. Writing application manuals is discussed in more detail in the section called “Writing Application and Applet Manuals” below. - - - - - - Application Help - + + + + + + Application Help - + + Applications should have a Help button on screens on which users may need help. These Help buttons should pull up the @@ -1192,17 +1172,17 @@ V1.1//EN"[]> manual, or else the relevant page thereof. Application help is described in more detail in the section called “Application Help Buttons” below. - - - - - - Application Context Sensitive Help (coming in + + + + + + Application Context Sensitive Help (coming in GNOME-2.0) - - + + 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 @@ -1212,16 +1192,16 @@ V1.1//EN"[]> detail in the section called “Writing Context Sensitive Help (coming in GNOME-2.0)” below. - - - - - - The GNOME User Guide - + + + + + + The GNOME User Guide - + + The GNOME User Guide describes the GNOME desktop environment and core components of GNOME such as the panel and @@ -1231,16 +1211,16 @@ V1.1//EN"[]> that is derived from various parts chosen in the system that are necessary for the new user to understand. - - - - - - User Documents - + + + + + + User Documents - + + Aside from the GNOME User Guide, there are several other documents to help GNOME users learn GNOME, including the GNOME FAQ, @@ -1248,68 +1228,61 @@ V1.1//EN"[]> Guide, and the GNOME Administrators Guide. - - - - - - Developer Documents - + + + + + + Developer Documents - + + There are many White Papers, Tutorials, HOWTO's and FAQ's to make programming GNOME and GNOME applications as easy as possible. - + 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 GNOME API Reference [http://developer.gnome.org/doc/API/] page. - - - - - - Project Documents - + + + + + + Project Documents - + + 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. - - - - - - - + + + + + + + DocBook Basics + - - + + - DocBook Basics + Introduction to DocBook - - - - - Introduction to DocBook - - - - + 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 @@ -1321,12 +1294,12 @@ V1.1//EN"[]> title with <title>The Title</title>. - + The DTD (in the case of the GDP, DocBook) defines rules for how the elements can be used. For example, if one element can only be used when embedded within another, this is defined in the DTD. - + An SGML file is just a plain ASCII file containing the text with the markup specified above. To convert it to some easily readable format, you need special tools. The GDP uses DocBook @@ -1334,7 +1307,7 @@ V1.1//EN"[]> which includes Jade, which does the SGML/DSSL parsing. You can read more about DocBook Tools in the section called “Installing DocBook”. - + The final appearance of the output (e.g. PostScript or HTML) is determined by a stylesheet. Stylesheets are files, @@ -1347,7 +1320,7 @@ V1.1//EN"[]> stylesheets); GNOME Document Project uses some customized version of this stylesheets -- see the section called “GDP Stylesheets”. - + The advantage of specifying the structure of a document with SGML instead of specifying the appearance of the document with a typical @@ -1359,7 +1332,7 @@ V1.1//EN"[]> large variety of media such as text, postscript, HTML, Braille, audio, and potentially many other formats. - + Using 'content' as the elements to define the text of a document also allows for search engines to make use of the actual elements to make a "smarter search". For example, if you are searching for all documents @@ -1367,30 +1340,30 @@ V1.1//EN"[]> enough to only search <author> elements, making for a faster and more accurate search. - + Since the overall appearance of the output is determined not by the DTD or the SGML document, but rather by a stylesheet, the appearance of a document can be easily changed just by changing the stylesheet. This allows everyone in the project to create documents that all look the same. - + As stated before, the GDP uses the DocBook DTD. For a list of introductory and reference resources on DocBook, see the section called “Resources”. The following sections also provide convenient instructions on which markup tags to use in various circumstances. Be sure to read the section called “GDP Documentation Conventions ” for GDP documentation-specific guidelines. - - - - - - XML and SGML - + + + + + + XML and SGML - In not so distant future (probably before GNOME 2.0), + + 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 @@ -1400,15 +1373,15 @@ V1.1//EN"[]> advised that the documentation writers conform to XML syntax rules. Here are most important differences: - - - - - Minimization - - - - + + + + + Minimization + + + + It is possible with some implementations of SGML to use minimizations to close elements in a document by using </>, for example: @@ -1420,16 +1393,16 @@ V1.1//EN"[]> mode, you can also use menu command Modify->Normalize. - - - - - - Self-closing tags - - - - + + + + + + Self-closing tags + + + + Also, in SGML some tags are allowed not to have closing tags. For example, it is legal for <xref> not to have a closing tag: @@ -1440,16 +1413,16 @@ V1.1//EN"[]> linkend="someid"/> (note the slash!). - - - - - - Case sensitive tags - - - - + + + + + + Case sensitive tags + + + + In XML, unlike SGML, tags are case-senstive <title> and <TITLE> are different tags! @@ -1457,27 +1430,27 @@ V1.1//EN"[]> things like DOCTYPE, CDATA and ENTITY, which are not DocBook tags). - - - - - - - - - Structure Elements - + + + + + + + + + Structure Elements - - - - - Sections and paragraphs - + + + + + + Sections and paragraphs - + + Top-level element of a book body must be <chapter>; it may contain one or more <sect1>, each of them may contain @@ -1488,26 +1461,26 @@ V1.1//EN"[]> you use, give each structural element a unique id, so that you can link to it. For usage example, see the template. - Please try to avoid using deeply nested sections; for + Please try to avoid using deeply nested sections; for most situations, <sect1> and <sect2> should be sufficient. If not, you probably should split your <sect1> into several smaller ones. - Use the tag <para> for + Use the tag <para> for paragraphs, even if there is only one paragraph in a section--see template for examples. - - - - - - Notes, Warnings, And Tips - + + + + + + Notes, Warnings, And Tips - + + 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 @@ -1524,27 +1497,27 @@ V1.1//EN"[]> </para> </tip> produces - - TIP - + + TIP + To speed up program compilation, use gcc compiler with Pentium optimization. - - + + Note that this should not be inside a <para> but between paragraphs. - - - - - - Screenshots and other figures - + + + + + + Screenshots and other figures - + + To include screenshots and other figures, use the following tags: @@ -1564,24 +1537,24 @@ V1.1//EN"[]> Screenshot - - NOTE - + + NOTE + Notice in this example that the screenshot file name does not include the file type extension -- to find out why, please read the section called “Images in DocBook Tools”. - - - - - - Program listings and terminal session - + + + + + + Program listings and terminal session - + + To show a file fragment--for example, program listing--use <programlisting> tag: @@ -1607,7 +1580,7 @@ Type=Application As a matter of fact, all examples in this document were produced using <programlisting>. - + To show a record of terminal session--i.e., sequence of commands entered at the command line--use <screen> tag: @@ -1626,7 +1599,7 @@ make: *** No rule to make target `love'. Stop. Note the use of tags <prompt> and <userinput> for marking system prompt and commands entered by user. - NOTE + NOTE Note that both <programlisting> and <screen> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -1635,30 +1608,30 @@ make: *** No rule to make target `love'. Stop. tags literally shown but not interpreted, - - - - - - Lists - + + + + + + Lists - + + The most common list types in DocBook are <itemizedlist>, <orderedlist>, and <variablelist>. - - - - - <itemizedlist> - - - - + + + + + <itemizedlist> + + + + This is the simplest unnumbered list, parallel to <ul> in HTML. Here is an example: @@ -1690,47 +1663,47 @@ make: *** No rule to make target `love'. Stop. and output: - - - - • - - - + + + + • + + + Show backup files -- This will show any backup file that might be on your system. - - - - - • - - - + + + + + • + + + Show hidden files -- This will show all "dot files" or files that begin with a dot. This files typically include configuration files and directories. - - - - - • - - - + + + + + • + + + 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. - - - - Note the use of &mdash; + + + + Note the use of &mdash; for long dash (see the section called “ Special symbols ”). Also, please note that the result looks much nicer because the terms being explained (Show backup @@ -1743,16 +1716,16 @@ make: *** No rule to make target `love'. Stop. this applies -- use <emphasis>. - - - - - - <orderedlist> - - - - + + + + + + <orderedlist> + + + + This list is completely analogous to <itemizedlist> and has the same syntax, but it produces numbered list. By default, @@ -1766,16 +1739,16 @@ make: *** No rule to make target `love'. Stop. upperroman, lowerroman. - - - - - - <variablelist> - - - - This list is used when each entry is + + + + + + <variablelist> + + + + 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 <variablelist> is more complicated @@ -1812,51 +1785,51 @@ make: *** No rule to make target `love'. Stop. - - - - + + + + Lists can be nested; in this case, the stylesheets are smart enough to change the numeration (for <orderedlist>) or marks of each entry (in <itemizedlist>) for sub-lists + + + + + + + Inline Elements + - + - Inline Elements + GUI elements - - - - - GUI elements - - - - - - - • - - - + + + + • + + + <guibutton> -- used for buttons, including checkbuttons and radio buttons - - - - - • - - - + + + + + • + + + <guimenu>, <guisubmenu> --used for top-level menus and submenus @@ -1864,53 +1837,53 @@ make: *** No rule to make target `love'. Stop. <guisubmenu>Utilities</guisubmenu> submenu of the <guimenu>Main Menu</guimenu> - - - - - • - - - + + + + + • + + + <guimenuitem>--an entry in a menu - - - - - • - - - + + + + + • + + + <guiicon>--an icon - - - - - • - - - + + + + + • + + + <guilabel>--for items which have labels, like tabs, or bounding boxes. - - - - - • - - - + + + + + • + + + <interface>-- for most everything else... a window, a dialog box, the Panel, etc. - - - - + + + + If you need to refer to a sequence of menu choices, such as Main Menu->Utilities->GNOME terminal @@ -1922,16 +1895,16 @@ make: *** No rule to make target `love'. Stop. <guimenuitem>GNOME terminal</guimenuitem> </menuchoice> - - - - - - Links and references - + + + + + + Links and references - + + To refer to another place in the same document, you can use tags <xref> and <link>. The first of them @@ -1944,12 +1917,12 @@ An example of a <link linkend="extip">tip</link> was given which produces: An example of a tip was given in the section called “Notes, Warnings, And Tips”. - + Here notes and extip are the id attributes of the section called “Notes, Warnings, And Tips” and of the example of a tip in it. - To produce a link to an external source, such as a + To produce a link to an external source, such as a Web page or a local file, use <ulink> tag, for example: @@ -1964,95 +1937,95 @@ url="http://www.gnome.org">GNOME Web page</ulink> unnecessary--see discussion of <email> tag). - - - - - - Filenames, commands, and other + + + + + + Filenames, commands, and other computer-related things - - + + Here are some tags used to describe operating system-related things: - - - - • - - - <filename> -- used + + + + • + + + <filename> -- used for filenames, e.g.<filename> foo.sgml </filename> produces: foo.sgml. - - - - - • - - - <filename + + + + + • + + + <filename class="directory"> -- used for directories, e.g.<filename class="directory">/usr/bin </filename> produces: /usr/bin. - - - - - • - - - + + + + + • + + + <application> -- used for application names, e.g. <application>Gnumeric </application> produces: Gnumeric. - - - - - • - - - + + + + + • + + + <envar> -- used for environment variables, e.g. <envar>PATH</envar>. - - - - - • - - - + + + + + • + + + <command> -- used for commands entered on command line, e.g. <command>make install </command> produces: make install. - - - - - • - - - + + + + + • + + + <replaceable> -- used for replaceable text, e.g. <command>db2html<replaceable> @@ -2061,22 +2034,22 @@ url="http://www.gnome.org">GNOME Web page</ulink> produces: db2html foo.sgml. - - - - - - - - - Keyboard input - + + + + + + + + + Keyboard input - To mark up text input by the user, use + + To mark up text input by the user, use <userinput>. - To mark keystrokes such as shortcuts and other + To mark keystrokes such as shortcuts and other commands, use <keycap>. This is used for marking up what is printed on the top of the physical key on the keyboard. There are a couple of @@ -2090,7 +2063,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> although <keysym> is useful for marking up control codes. - + To mark up a combination of keystrokes, use the <keycombo> wrapper: @@ -2102,7 +2075,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </keycombo> - + Finally, if you want to show a shortcut for some menu command, here are the appropriate tags (rather long): @@ -2117,16 +2090,16 @@ url="http://www.gnome.org">GNOME Web page</ulink> which produces simply Quit (Ctrl-q) - - - - - - E-mail addresses - + + + + + + E-mail addresses - To mark up e-mail + + To mark up e-mail address, use <email>: The easiest way to get in touch with me is by e-mail @@ -2137,16 +2110,16 @@ url="http://www.gnome.org">GNOME Web page</ulink> <email> automatically produces a link in html version. - - - - - - Special symbols - + + + + + + Special symbols - + + 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 @@ -2155,62 +2128,62 @@ url="http://www.gnome.org">GNOME Web page</ulink> &entityname;. Note that the semicolon is required. - + here is partial list of most commonly used enitites: - - - - • - - - + + + + • + + + &amp; -- ampersend (&) - - - - - • - - - + + + + + • + + + &lt; -- left angle bracket (<) - - - - - • - - - + + + + + • + + + &copy; -- copyright sign (©) - - - - - • - - - + + + + + • + + + &mdash; -- long dash (--) - - - - - • - - - + + + + + • + + + &hellip; -- ellipsis (...) - - - - + + + + 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 (&mdash;) looks @@ -2218,80 +2191,73 @@ url="http://www.gnome.org">GNOME Web page</ulink> (and thus, in print) the output will look markedly better if you use appropriate tags. - - - - - - - + + + + + + + GDP Documentation Conventions + - - + + - GDP Documentation Conventions + Conventions for All GDP Documentation - + - Conventions for All GDP Documentation + XML compatibility - - - - - XML compatibility - - - - + All GNOME documentation should conform to XML syntax requirements, which are stricter than SGML ones -- see the section called “XML and SGML” for more informaion. - - - - - - Authors' names - + + + + + + Authors' names - + + 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. + + + + + + + Conventions for Application Documentation + - + - Conventions for Application Documentation + Application Version Identification - - - - - Application Version Identification - - - - + Application documentation should identify the version of the application for which the documentation is written: @@ -2304,16 +2270,16 @@ url="http://www.gnome.org">GNOME Web page</ulink> </sect1> - - - - - - Copyright information - + + + + + + Copyright information - Application + + 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 @@ -2322,53 +2288,46 @@ url="http://www.gnome.org">GNOME Web page</ulink> Linux, Windows, etc.), proper legal junk should also be included (see templates). - - - - - - Software license - + + + + + + Software license - + + All GNOME applications must contain information about the license (for software, not for documentation), either in the "About" box or in the manual. - - - - - - Bug reporting - + + + + + + Bug reporting - + + Application documentation should give an address for reporting bugs and for submitting comments about the documentaion (see templates for an example). - - - - - - - - - - - - - - Writing Application and Applet Manuals - + + + + + + + Writing Application and Applet Manuals - + + 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 @@ -2377,25 +2336,25 @@ url="http://www.gnome.org">GNOME Web page</ulink> PNG format only) when appropriate. They should also describe each feature and preference option available. - - Documentation Availability - + + Documentation Availability + 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. - - Application manuals should be based on the template in + + Application manuals should be based on the template in the section called “Template 1: Application Manual”. Applet manuals should be based on the templates in the section called “Template 2: Applet Manual For GNOME 1.x” for GNOME versions 1.x and the templates in the section called “Template 2: Applet Manual For GNOME 2.x” for GNOME versions 2.x. - - Manuals For Large Applications - + + Manuals For Large Applications + Manuals for very large applications, such as GNOME Workshop components should be a <book> (and thus use <chapter> for each primary section) @@ -2403,10 +2362,10 @@ url="http://www.gnome.org">GNOME Web page</ulink> applications use(with each primary section being a <sect1>). - - - Applet Manuals in GNOME 2.0 - + + + Applet Manuals in GNOME 2.0 + 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 @@ -2416,8 +2375,8 @@ url="http://www.gnome.org">GNOME Web page</ulink> have several sections, each of which is <sect2>. - - + + Application manuals should be made available by having a "Manual" entry in the Help pull-down menu at the top of the @@ -2425,30 +2384,23 @@ url="http://www.gnome.org">GNOME Web page</ulink> Applets should make their manuals available by right-clicking on the applet. - - - - - - - - - - - - - Listing Documents in the Help Menu - + + + + + + Listing Documents in the Help Menu - - Developer Information - + + + Developer Information + This section is for developers. Documentation authors generally do not need to know this material. - - + + Typically the application manual and possibly additional help documents will be made available to the user under the Help menu at the top right of the @@ -2478,14 +2430,14 @@ function-reference.html Gnumeric function reference from SGML into HTML with db2html) should be placed in this directory too. - - Note - + + Note + If the help files are not present in the correct directory, the menu items will NOT appear when the program is run. - - + + The topic.dat file is used by the GNOME menu building code to generate the Help menu. When you define your menu: @@ -2509,30 +2461,23 @@ GnomeUIInfo helpmenu[] = { topics from the Help menu, a help browser will be started with the associated HTML documentation. - - - - - - - - - - - - - Application Help Buttons - + + + + + + Application Help Buttons - - Developer Information - + + + Developer Information + This section is for developers. Documentation authors generally do not need to know this material. - - + + Most GNOME applications will have Help buttons. These are most often seen in Preference windows. (All Preference windows should have Help @@ -2545,11 +2490,11 @@ GnomeUIInfo helpmenu[] = { application correctly opens the help documentation when the Help buttons are pressed. - + To make the Help buttons call the correct document in the GNOME Help Browser the developer should add code based on the following example: - + gchar *tmp; tmp = gnome_help_file_find_file ("module", "page.html"); if (tmp) { @@ -2557,38 +2502,31 @@ if (tmp) { g_free(tmp); } - - NOTE - + + NOTE + The example above is in the C language, please refer to other documentation or forums for other GNOME language bindings. + + + + + + + Packaging Applet Documentation + - - - - - - - - - + + - Packaging Applet Documentation + Applet Documentation Files - - - - - Applet Documentation Files - - - - + In GNOME 2.0 each applet will have its own documentation installed separately, and the GNOME 2.0 help browser (Nautilus) will dynamically @@ -2606,12 +2544,12 @@ if (tmp) { contacted to modify the menu items and help buttons to bind to the applet documentation if necessary. - + Images which are part of the applet documentation should be in PNG format and should reside in the same directory as the SGML document file in CVS(gnome-applets/APPLETNAME/help/C). - + 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 @@ -2625,30 +2563,30 @@ if (tmp) { remember to add <legalnotice> and <copyright> sections. - - - - - - Adding Documentation to an Applet Menu - + + + + + + Adding Documentation to an Applet Menu - - Developer Information - + + + Developer Information + This section is for developers. Documentation authors generally do not need to know this material. - - + + Applets should have About and Manual menu items, typically as the first and second top-most items in the menu respectively. This section describes how the developer creates these menu items and links them to the documentation. - + To add an applet's manual to its applet menu, use: /* add an item to the applet menu */ @@ -2660,13 +2598,13 @@ _("Manual"), &open_manual, NULL); when the user right clicks on the applet, and the fourth argument is the callback function. - + You will need to write a simple callback function to open the help browser to the appropriate document. This is done using the gnome_help_file_find_file function, as described in the section called “Application Help Buttons”. - + You will also want to add an About menu item to the applet's menu. This is a stock menu item and is done: @@ -2676,39 +2614,32 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", NULL); - + More information can be found at Writing GNOME panel applets using the GTK+/GTK-- widget set [http://developer.gnome.org/doc/tutorials/applet/index.html]. - - - - - - - - - - - - - - Writing Context Sensitive Help (coming in GNOME-2.0) - + + + + + + + Writing Context Sensitive Help (coming in GNOME-2.0) - + + Context sensitive help, also known as "pop-up" help, will allow a user to obtain help information about specific buttons or parts of an application. - + Context sensitive help is still under development and not all the details are available at this time. However, the basics can be shown here so that you can understand how the system will work. - + The Context Sensitive Help system is designed to allow the developer to give an id to a particular portion of the User Interface, for example, a button. Once the interface is complete @@ -2717,12 +2648,12 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", writer to associate particular paragraph sections from an XML document to the interface items. - + The XML used for the document is a small XML DTD that is being developed to use the same tags (albeit, much fewer) as DocBook so that writers do not have to re-learn a new DTD. - + Once the document is written and map file is complete, when the user launches context sensitive help on the interface (either by pressing a button and then clicking on the interface item they @@ -2731,45 +2662,31 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", small transient window will appear with brief but detailed information on the interface item. - - - - - - - - - - - - - Referring to Other GNOME Documentation (coming in + + + + + + Referring to Other GNOME Documentation (coming in GNOME-2.0) - - + + 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. - - - - - - - - - - - - - Basics of Documentation Style - + + + + + + Basics of Documentation Style - + + 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 @@ -2783,7 +2700,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", experts. Remember, your goal is to produce complete, intuitive and clear documentation. - + In order to write useful documentation, you'll have to know who your audience is likely to be. Then, you can look for the problems they're likely to run into, and solve them. It will @@ -2791,15 +2708,15 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", group features accordingly, rather than simply describing features at random. - - - - - Planning - + + + + + Planning - + + 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 @@ -2811,19 +2728,19 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", <chapter> or <article>. - - - - - - Achieving a Balanced Style - + + + + + + Achieving a Balanced Style - + + Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - • + • 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, @@ -2833,7 +2750,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - • + • Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -2842,14 +2759,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - • + • 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. - • + • 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 @@ -2859,16 +2776,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", individuality as a writer. - - - - - - Structure - + + + + + + Structure - + + 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. @@ -2877,7 +2794,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", use every available structural tag, but take advantage of what DocBook provides you. - + As to linking, there's some disagreement about whether to use <xref> <link> when you make links within your documents. You'll have to @@ -2887,7 +2804,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", them. Help your readers find information that relevant to the issue at hand. - + The table of contents will be generated automatically, but you will probably have to develop your own index if you wish to have one. The Nautilus Help Browser will have new, and @@ -2897,16 +2814,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", writing a<book>, it will probably be best to contribute to that rather than developing your own. - - - - - - Grammar and Spelling - + + + + + + Grammar and Spelling - + + 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 @@ -2916,45 +2833,38 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", in a "real" release, they can count against the credibility of GNOME and Linux. They'll also make you look bad. - + There is no substitute for a human proofreader; use a spell-check program, then read it over yourself, and then find someone else to help you. Other GDP members are, of course, willing and able to help you, but non-writers are often at least as helpful. - + Proofreading documents is both a also a good way to 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. + + + + + + + Teamwork + - - - - - - - - - + + - Teamwork + Working With The GDP Team - - - - - Working With The GDP Team - - - - + 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 @@ -2968,7 +2878,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", else by emailing the gnome-doc-list mailing list [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]. - + After an author has finished a document (or even a draft version of the document), it is a good idea to ask a member of the GDP team to read the document, checking it for grammar, @@ -2977,16 +2887,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", channel at irc.gnome.org or by emailing the gnome-doc-list mailing list [http://mail.gnome.org/mailman/listinfo/gnome-doc-list/]. - - - - - - Working With Developers - + + + + + + Working With Developers - + + 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 @@ -2997,47 +2907,40 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", make sure that the application author correctly binds and packages the documentation with the application. + + + + + + + Finishing A Document + - - - - - - - - - + + - Finishing A Document + Editing The Document - - - - - Editing The Document - - - - + 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. - - - - - - Submitting The Document - + + + + + + Submitting The Document - + + 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 @@ -3051,117 +2954,103 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", documentation in the package. Generally, this should be done by the developers. - + The final step is to email the GNOME Translation Team at <gnome-i18n@nuclecu.unam.mx> to notify them that there is a new document for them to translate. + + + + + + + Resources + - - - - - - - - - + + - Resources + Resources On The Web - - - - - Resources On The Web - - - - The GNOME + The GNOME Documentation Project Web page [http://developer.gnome.org/projects/gdp/] lists current GDP projects and members. - + The GDP Documentation Status Table [http://www.gnome.org/gdp/doctable/] tracks the status of all the various documentation components of GNOME. - + Norman Walsh's DocBook: The Definitive Guide [http://www.docbook.org] in an excellent book on DocBook, available both online and in print. - - - - - - Books - + + + + + + Books - + + Docbook: The Definitive Guide is available in both printed form and on the web at: Docbook: The Definitive Guide [http://www.docbook.org/tdg/index.html] - - - - - - Mailing Lists - + + + + + + Mailing Lists - + + The gnome-docs-list 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 GNOME Mailing Lists [http://www.gnome.org/resources/mailing-lists.html]. This is a rather low-volume list, so you will not be flooded with messages. - - - - - - IRC - + + + + + + IRC - + + 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. - - - + + Document Templates - - - - - - - - - - - Template 1: Application Manual - + + + + + Template 1: Application Manual - + + The following template should be used for all application manuals. You can always get the latest copy of this template from GDP @@ -3898,23 +3787,16 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", - - - - - - - - - - - - - Template 2: Applet Manual For GNOME 1.x - + + + + + + Template 2: Applet Manual For GNOME 1.x - + + 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 GDP @@ -4237,29 +4119,22 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", - - - - - - - - - - - - - Template 2: Applet Manual For GNOME 2.x - + + + + + + Template 2: Applet Manual For GNOME 2.x - + + 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 GDP Documentation Templates [http://developer.gnome.org/projects/gdp/templates.html]. - + Note that this template consists of two files. The first file is an introductory chapter. You should not modify this chapter. The second file is the actual applet document, which @@ -4272,7 +4147,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", at the top of the shell document to reflect the new name of the applet document. - + <!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[ @@ -4880,8 +4755,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", - - + diff --git a/tests/docbook/result/fo/graphics.fo b/tests/docbook/result/fo/graphics.fo index dd65bd0..499c80a 100644 --- a/tests/docbook/result/fo/graphics.fo +++ b/tests/docbook/result/fo/graphics.fo @@ -81,7 +81,7 @@ - + @@ -93,93 +93,72 @@ Graphics Test Document Title - - - - - - - - - - - Graphic - + + + + + Graphic - fileref: - - - - entityref: - - - - fileref, scale=200: - - - - fileref, width=20, depth=20 - - - - - - - - - - - - - - - - Inlinegraphic - + + fileref: + + + + entityref: + + + + fileref, scale=200: + + + + fileref, width=20, depth=20 + + + + + + + + + Inlinegraphic - fileref: - entityref: - fileref, scale=200: - - - - - - - - - - - - - MediaObject - + + fileref: + entityref: + fileref, scale=200: + + + + + + MediaObject - fileref: - - - - entityref: - - - - fileref, scale=20: - - - - fileref, width=200, depth=400: - - - - fileref, width=20, depth=20, alt=Alt text: - - - - - + + fileref: + + + + entityref: + + + + fileref, scale=20: + + + + fileref, width=200, depth=400: + + + + fileref, width=20, depth=20, alt=Alt text: + + + + diff --git a/tests/docbook/result/fo/gtest.fo b/tests/docbook/result/fo/gtest.fo index e9cc992..0dd406d 100644 --- a/tests/docbook/result/fo/gtest.fo +++ b/tests/docbook/result/fo/gtest.fo @@ -81,7 +81,7 @@ - + Chapter 1. Graphics Test diff --git a/tests/docbook/result/fo/idxbook.fo b/tests/docbook/result/fo/idxbook.fo index ecd5ec3..85c7a80 100644 --- a/tests/docbook/result/fo/idxbook.fo +++ b/tests/docbook/result/fo/idxbook.fo @@ -81,7 +81,7 @@ - + @@ -110,7 +110,7 @@ Foreword - + 1 First Chapter @@ -119,7 +119,7 @@ First Sect1 - + @@ -128,16 +128,16 @@ A First Appendix - + Index - + - + @@ -149,7 +149,7 @@ Foreword - This is a test paragraph. + This is a test paragraph. @@ -169,24 +169,17 @@ Chapter 1. First Chapter - Paragraph. - - - - - - - - - - - First Sect1 - + Paragraph. + + + + + First Sect1 - Another paragraph. - - + + Another paragraph. + @@ -207,24 +200,24 @@ This is a test paragraph. - - - + + + - - + + - + - - + + - - - + + + - + Appendix A. First Appendix @@ -242,26 +235,26 @@ This is just a test. - - + + - - + + - - + + - - - + + + - - - + + + - + diff --git a/tests/docbook/result/fo/kwrite.fo b/tests/docbook/result/fo/kwrite.fo index 61cf075..7f71346 100644 --- a/tests/docbook/result/fo/kwrite.fo +++ b/tests/docbook/result/fo/kwrite.fo @@ -81,7 +81,7 @@ - + @@ -274,540 +274,519 @@ bash, modula 2, html, and ada. kwrite is very simple to use. anyone that has used a text editor should have no problems. - - - - - - - - - - - drag and drop - + + + + + drag and drop - kwrite uses the kde drag and drop protocol. files may be dragged + + 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. - - - - - - - - - - - - - command line options - + + + + + + command line options - though kwrite may most often be started from the kde program menu, + + 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. - - - - - specify a file - + + + + + specify a file - by specifying the path and name of a particular file the user can + + 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: - - % kwrite /home/myhome/docs/myfile.txt - + + % kwrite /home/myhome/docs/myfile.txt - - - - - specify a file on the internet - + + + + + + specify a file on the internet - the above-mentioned method could even be used to open files on the + + 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: - - % kwrite ftp://ftp.kde.org/pub/kde/welcome.msg - + + % kwrite ftp://ftp.kde.org/pub/kde/welcome.msg - - - - - other command line options - + + + + + + other command line options - the following command line help options are available - - - - - - kwrite --help - - - - - this lists the most basic options available at the command + + the following command line help options are available + + + + + + kwrite --help + + + + + this lists the most basic options available at the command line. - - - - - - - kwrite --help-qt - - - - - this lists the options available for changing the way + + + + + + + kwrite --help-qt + + + + + this lists the options available for changing the way kwrite interacts with qt™. - - - - - - - kwrite --help-kde - - - - - this lists the options available for changing the way + + + + + + + kwrite --help-kde + + + + + this lists the options available for changing the way kwrite interacts with kde. - - - - - - - kwrite --help-all - - - - - this lists all of the command line options. - - - - - - - kwrite --author - - - - - lists kwrite's authors in the terminal window - - - - - - - kwrite --version - - - - - lists version information for qt™, kde, and kwrite. also available through kwrite -v - - - - - - - - - - - - - - - - - key bindings - + + + + + + + kwrite --help-all + + + + + this lists all of the command line options. + + + + + + + kwrite --author + + + + + lists kwrite's authors in the terminal window + + + + + + + kwrite --version + + + + + lists version information for qt™, kde, and kwrite. also available through kwrite -v + + + + + + + + + + key bindings - many of the key bindings (shortcuts) are configurable by way of the settings menu. by default kwrite honors the + + many of the key bindings (shortcuts) are configurable by way of the settings menu. by default kwrite honors the following key bindings. - - - - - - - - insert - - - - - toggle between insert and overwrite mode. when in insert mode the + + + + + + + + insert + + + + + 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. - - - - - - - left arrow - - - - - move the cursor one character to the left - - - - - - - right arrow - - - - - move the cursor one character to the right - - - - - - - up arrow - - - - - move the cursor up one line - - - - - - - down arrow - - - - - move the cursor down one line - - - - - - - page up - - - - - move the cursor up one page - - - - - - - page down - - - - - move the cursor down one page - - - - - - - backspace - - - - - delete the character to the left of the cursor - - - - - - - home - - - - - move the cursor to the beginning of the line - - - - - - - end - - - - - move the cursor to the end of the line - - - - - - - delete - - - - - delete the character to the right of the cursor (or any selected + + + + + + + left arrow + + + + + move the cursor one character to the left + + + + + + + right arrow + + + + + move the cursor one character to the right + + + + + + + up arrow + + + + + move the cursor up one line + + + + + + + down arrow + + + + + move the cursor down one line + + + + + + + page up + + + + + move the cursor up one page + + + + + + + page down + + + + + move the cursor down one page + + + + + + + backspace + + + + + delete the character to the left of the cursor + + + + + + + home + + + + + move the cursor to the beginning of the line + + + + + + + end + + + + + move the cursor to the end of the line + + + + + + + delete + + + + + delete the character to the right of the cursor (or any selected text) + + + + + + + shift-left arrow + + + + + mark text one character to the left + + + + + + + shift-right arrow + + + + + mark text one character to the right + + + + + + + f1 + + + + + help + + + + + + + shift-f1 + + + + + + what's this? - - - - - - shift-left arrow - - - - - mark text one character to the left - - - - - - - shift-right arrow - - - - - mark text one character to the right - - - - - - - f1 - - - - - help - - - - - - - shift-f1 - - - - - - what's this? - - - - - - - - ctrl-f - - - - - - find - - - - - - - - f3 - - - - - - find again - - - - - - - - ctrl-c - - - - - copy the marked text to the clipboard. - - - - - - - ctrl-m - - - - - set a bookmark - - - - - - - ctrl-n - - - - - new document - - - - - - - ctrl-p - - - - - print - - - - - - - ctrl-q - - - - - quit - close active copy of editor - - - - - - - ctrl-r - - - - - - replace - - - - - - - - ctrl-s - - - - - invokes the save command. - - - - - - - ctrl-v - - - - - paste the clipboard text into line edit. - - - - - - - ctrl-x - - - - - delete the marked text and copy it to the clipboard. + + + + + + + ctrl-f + + + + + + find - - - - - - ctrl-z + + + + + + + f3 + + + + + + find again - - - - - undo - + + + + + + + ctrl-c + + + + + copy the marked text to the clipboard. + + + + + + + ctrl-m + + + + + set a bookmark + + + + + + + ctrl-n + + + + + new document + + + + + + + ctrl-p + + + + + print + + + + + + + ctrl-q + + + + + quit - close active copy of editor + + + + + + + ctrl-r + + + + + + replace - - - - - - ctrl-shift-z + + + + + + + ctrl-s + + + + + invokes the save command. + + + + + + + ctrl-v + + + + + paste the clipboard text into line edit. + + + + + + + ctrl-x + + + + + delete the marked text and copy it to the clipboard. + + + + + + + ctrl-z + + + + + + undo - - - - - redo - + + + + + + + ctrl-shift-z + + + + + + redo - - - - - - + + + + + + @@ -827,40 +806,34 @@ text) Chapter 3. the menu entries - - - - - - - - - - - the file menu - + + + + + the file menu - - - - - file->new (ctrl-n) - - - - this starts a new document in the editor. if there is a current + + + + + + file->new (ctrl-n) + + + + 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. - - - - - - file->0pen (ctrl-o) - - - - this command opens a file. it does this by means of a dialog box + + + + + + file->0pen (ctrl-o) + + + + 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 @@ -874,7 +847,7 @@ filter contained text such as *.txt 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. - the toolbar, which is located at the top of the dialog, has left and right + the toolbar, which is located at the top of the dialog, has left and right arrow buttons that let the user move back and forth through previously selected directories as well as an up arrow button for moving up the directory tree. the button with the little house takes the user to his or her home directory and the one @@ -884,140 +857,133 @@ 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. - - - - - - file->open + + + + + + file->open recent - - - - this is a shortcut to open recently saved documents. clicking on + + + + 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. - - - - - - file->save (ctrl-s) - - - - this saves the current document. if there has already been a + + + + + + file->save (ctrl-s) + + + + 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. - - - - - - file->save + + + + + + file->save as - - - - this allows a document to be saved with a new file name. this is + + + + 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 open section of this help file. - - - - - - file->print (ctrl-p) - - - - opens a simple print dialog allowing the user to specify what, where, and how to print - - - - - - file->new window - - - - this creates a new window, i.e. a new instance of kwrite. in this way the user can easily work + + + + + + file->print (ctrl-p) + + + + opens a simple print dialog allowing the user to specify what, where, and how to print + + + + + + file->new window + + + + 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. - - - - - - file->new view - - - - this creates a new view of the current document, i.e., a new instance of + + + + + + file->new view + + + + 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. - - - - - - file->quit (ctrl-q) - - - - this will close the editor window, if you have more than one + + + + + + file->quit (ctrl-q) + + + + 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. - - - - - - - - - - - - - - - - the edit menu - + + + + + + + + + the edit menu - - - - - edit->undo (ctrl-z) - - - - this is used to eliminate or reverse the most recent user action or operation. just what + + + + + + edit->undo (ctrl-z) + + + + 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 group undos portion of this help file. - - - - - - edit->redo (ctrl-shift-z) - - - - this will reverse the most recent change (if any) made using undo - - - - - - edit->undo/redo history - - - - this will call a display box showing a list of the most recent actions on + + + + + + edit->redo (ctrl-shift-z) + + + + this will reverse the most recent change (if any) made using undo + + + + + + edit->undo/redo history + + + + 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 @@ -1032,74 +998,74 @@ 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. - - - - - - edit->cut (ctrl-x) - - - - this command deletes the current selection and places it on the clipboard. the + + + + + + edit->cut (ctrl-x) + + + + 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. - - - - - - edit->copy (ctrl-c) - - - - this copies the currently selected text to the clipboard so that it may be + + + + + + edit->copy (ctrl-c) + + + + 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. - - - - - - edit->paste (ctrl-v) - - - - this will insert the contents of the clipboard at the cursor position. the + + + + + + edit->paste (ctrl-v) + + + + 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. - - - - - - edit->select all (ctrl-a) - - - - this will select the entire document. this could be very useful for + + + + + + edit->select all (ctrl-a) + + + + this will select the entire document. this could be very useful for copying the entire file to another application. - - - - - - edit->invert selection - - - - this selects any unselected text while unselecting any selected text - + + + + + + edit->invert selection + + + + this selects any unselected text while unselecting any selected text - effectively reversing the current state of selection. - - - - - - edit->find (ctrl-f) - - - - this opens the find dialog which is used to specify the text to + + + + + + edit->find (ctrl-f) + + + + 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 @@ -1113,431 +1079,410 @@ 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. - - - - - - edit->find next (f3) - - - - this repeats the last find operation, if any, without calling the find + + + + + + edit->find next (f3) + + + + this repeats the last find operation, if any, without calling the find dialog box. - - - - - - edit->replace (ctrl-r) - - - - this command opens the replace dialog box. the replace dialog is + + + + + + edit->replace (ctrl-r) + + + + 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. - - - - - - + + + + + + edit->insert file - - - - this opens the file open dialog box whereby the + + + + this opens the file open 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. - - - - - - - - - - - - - - - - the go menu - + + + + + + + + + the go menu - - - - - go->go to line - - - - this opens the goto line dialog box which is used to have the cursor jump + + + + + + go->go to line + + + + 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. - - - - - - go->add marker (ctrl-m) - - - - this creates a marker in the document at the line where the cursor is + + + + + + go->add marker (ctrl-m) + + + + 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. - markers are points within a kwrite document + 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. - - - - - - go->set marker - - - - this creates a marker in the document at the line where the cursor is + + + + + + go->set marker + + + + 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. - - - - - - go->clear markers - - - - this command will remove all the markers from the docucument as well as the + + + + + + go->clear markers + + + + 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. - - - - at the bottom of this menu, a list of markers appears if any + + + + at the bottom of this menu, a list of markers appears if any markers are available for this window. - - - - - - - - - - - - - the tools menu - + + + + + + the tools menu - - - - - tools->spelling... - - - - this initiates the spell checking program - a program + + + + + + tools->spelling... + + + + 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: - - - - - misspelled word: - - - - here, the spell checker indicates the word currently under + + + + + misspelled word: + + + + 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. - - - - - - replacement: - - - - if the checker has any similar words in its dictionary the + + + + + + replacement: + + + + 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. - - - - - - suggestions: - - - - the checker may list here a number of possible replacements for + + + + + + suggestions: + + + + 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. - - - - on the right side of the dialog box are 6 buttons that allow the user to + + + + on the right side of the dialog box are 6 buttons that allow the user to control the spell check process. they are: - - - - - replace - - - - this button has the checker replace the word under + + + + + replace + + + + this button has the checker replace the word under consideration in the document with the word in the replacement: box. - - - - - - replace all - - - - this button causes the checker to replace not only the current + + + + + + replace all + + + + 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. - - - - - - ignore - - - - activating this button will have the checker move on without + + + + + + ignore + + + + activating this button will have the checker move on without making any changes. - - - - - - ignore all - - - - this button tells the checker to do nothing with the current + + + + + + ignore all + + + + this button tells the checker to do nothing with the current misspelled word: and to pass over any other instances of the same word. - - Note - this only applies to the current spell check + + Note + this only applies to the current spell check run. if the checker is run again later it will stop on this same word. - - - - - - - add - - - - pressing this button adds the word in the misspelled + + + + + + + add + + + + 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. - - - - - - stop - - - - this button stops the spell check process. - - - - located horizontally along the bottom of the spell check dialog is a + + + + + + stop + + + + this button stops the spell check process. + + + + 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. - - Note - a numerical display of the spell check + + Note + a numerical display of the spell check process is simultaneously displayed in the status bar of the editor. the status bar is the horizontal strip at the bottom of the editor just outside of the text entry area. - - two more buttons are located below the progress bar. they are: - - - - - help - - - - this invokes the kde help system starting at the kwrite help + + two more buttons are located below the progress bar. they are: + + + + + help + + + + this invokes the kde help system starting at the kwrite help pages (this document). - - - - - - cancel - - - - this button cancels the spell check process. - - - - - - tools->indent - - - - this increases the paragraph's indentation by one step. the size of the + + + + + + cancel + + + + this button cancels the spell check process. + + + + + + tools->indent + + + + this increases the paragraph's indentation by one step. the size of the step depends on the indentation settings. - - - - - - tools->unindent - - - - this reduces the paragraph's indentation by one step. the size of the step + + + + + + tools->unindent + + + + this reduces the paragraph's indentation by one step. the size of the step depends on the indentation settings. - - - - - - tools->clean + + + + + + tools->clean indentation - - - - not yet implemented - - - - - - tools->comment - - - - this adds one space to the beginning of the line + + + + not yet implemented + + + + + + tools->comment + + + + this adds one space to the beginning of the line where the text cursor is located or to the beginning of any selected lines. - - - - - - tools->uncomment - - - - this removes one space (if any exist) from the beginning of the line + + + + + + tools->uncomment + + + + 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. - - - - - - - - - - - - - - - - - - - the settings menu - + + + + + + + + + + + + the settings menu - - - - - settings->show toolbar - - - - when checked, this displays a movable toolbar containing buttons used to + + + + + + settings->show toolbar + + + + when checked, this displays a movable toolbar containing buttons used to initiate frequently used commands. when unchecked the toolbar is hidden. - - - - - - settings->show statusbar - - - - when checked, this displays a small bar at the bottom of the editor + + + + + + settings->show statusbar + + + + 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. - - - - - - settings->show path - - - - when selected, this displays in the title bar the path (its location in the + + + + + + settings->show path + + + + 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. - - - - - - settings->configure key bindings - - - - this command opens a dialog box whereby the key bindings may be changed. a display window at + + + + + + settings->configure key bindings + + + + this command opens a dialog box whereby the key bindings 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 @@ -1553,16 +1498,16 @@ the key button, and then press the k k would mean that anytime he or she held down the ctrl and alt buttons and pressed k (while using kwrite) the about kde display box would be called. - - - - - - settings->configure toolbars - - - - this will open the dialog whereby the toolbar configuration may + + + + + + settings->configure toolbars + + + + 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 @@ -1573,145 +1518,137 @@ 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. - - - - - - settings->preferences - - - - this menu item opens a dialog whereby several different settings may be adjusted. - - - - - - settings->configure + + + + + + settings->preferences + + + + this menu item opens a dialog whereby several different settings may be adjusted. + + + + + + settings->configure highlighting - - - - opens a dialog box allowing configuration of the syntax + + + + opens a dialog box allowing configuration of the syntax highlighting. the dialog is described in Chapter 5. highlighting. - - - - - - settings->vertical + + + + + + settings->vertical selection - - - - this is used to turn on or off the vertical selection feature. vertical + + + + 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. - - - - - - settings->highlight mode - - - - this allows the user to choose the style of color highlighting which the + + + + + + settings->highlight mode + + + + 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. - - - - - - settings->end of line - - - - this opens a sub-menu from which the user can select the type of ‘end of + + + + + + settings->end of line + + + + 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. - - - - - - - - - - - - - - - - the help menu - + + + + + + + + + the help menu - - - - - help->contents (f1) - - - - this invokes the kde help system starting at the kwrite help pages (this document). - - - - - - help->what's this? (shift-f1) - - - - this changes the mouse cursor to a combination arrow and question mark. + + + + + + help->contents (f1) + + + + this invokes the kde help system starting at the kwrite help pages (this document). + + + + + + help->what's this? (shift-f1) + + + + 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. - - - - - - help->report bug - - - - this calls a dialog box to help + + + + + + help->report bug + + + + 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. - - - - - - help->about kwrite - - - - this will display version and author information - - - - - - help->about kde - - - - this displays the kde version and other basic information. - - - - - + + + + + + help->about kwrite + + + + this will display version and author information + + + + + + help->about kde + + + + this displays the kde version and other basic information. + + + + @@ -1744,26 +1681,20 @@ cancel the process. the categories colors, indent, select, edit, and spelling are detailed below. - - - - - - - - - - - colors - + + + + + colors - this section provides access to five different color settings, + + this section provides access to five different color settings, 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 dialog box used to change the setting. - the color dialog box provides a convenient and graphical way to + the color dialog box provides a convenient and graphical way to select a color. in the upper left of the box is a rectangular display of a spectrum of colors. to the immediate right of this, is vertical bar displaying a range of intensity from the most dark at the bottom to the @@ -1781,13 +1712,13 @@ consideration at any time. to the right of this display is another text box labeled html: this shows the user the color code that would be used to specify the particular displayed color in html code which is widely used for web pages. - in addition to the above, the color dialog allows the capture of any + in addition to the above, the color dialog allows the capture of any color currently displayed on the desktop or in another program. clicking on the button with the dropper icon (located on the right side of the dialog box,) changes the shape of the mouse cursor to a set of crosshairs. clicking again will pick up the color attributes of whatever color is displayed under the cross hairs. - furthermore the user has the option of adding any color to a personal + furthermore the user has the option of adding any color to a personal palette of “custom colors” by clicking on the wide button labeled add to custom colors (which is located directly above the display square.) this adds the current color to the custom color palette. this @@ -1795,344 +1726,323 @@ 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. - - - - - background - - - - here the user can specify a color for the general background of + + + + + background + + + + here the user can specify a color for the general background of kwrite. - - - - - - text background - - - - this is used to set a particular color to display in the + + + + + + text background + + + + this is used to set a particular color to display in the background of those areas of the document containing text. - - - - - - selected - - - - this allows the user to select a color to be used for indicating + + + + + + selected + + + + this allows the user to select a color to be used for indicating selected (or highlighted) portions of the document. - - - - - - found - - - - this specifies the preferred color with which to mark text + + + + + + found + + + + this specifies the preferred color with which to mark text encountered as the result of a find operation. - - - - - - selected + found - - - - this sets the color for text that has not only been found as in -the previous entry above but that has also been selected. - - - - - - - - - - - - - - - - indent + + + + + + selected + found + + + this sets the color for text that has not only been found as in +the previous entry above but that has also been selected. + + + + + + + + + indent - - - - - auto indent - - - - this causes + + + + + + auto indent + + + + this causes new lines to begin with the same indentation level as the previous line. - - - - - - indent with spaces - - - - this + + + + + + indent with spaces + + + + this replaces tabs with the number of spaces selected in the tab width window in the edit section of the preferences dialog. - - - - - - backspace key indents - - - - this allows the + + + + + + backspace key indents + + + + this allows the backspace key to be used to indent. - - - - - - tab key indents - - - - this + + + + + + tab key indents + + + + this allows the tab key to be used to indent. - - - - - - keep indent profile - - - - this + + + + + + keep indent profile + + + + this retains current indentation settings for future documents. - - - - - - keep extra spaces - - - - indentations of more than the selected number of spaces -will not be shortened. - - - - - - - - - - - - - - - - select + + + + + + keep extra spaces + + + indentations of more than the selected number of spaces +will not be shortened. + + + + + + + + + select - - - - - persistent selections - - - - this prevents key input or cursor movement by way of the + + + + + + persistent selections + + + + this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection. - - Note - (note: if the overwrite selections option is + + Note + (note: if the overwrite selections option is activated then any typed character input or paste operation will replace the selected text.) - - - - - - - overwrite selections - - - - any keyed character input or paste operation will replace + + + + + + + overwrite selections + + + + any keyed character input or paste operation will replace the selected text. - - - - - - mouse autocopy - - - - any text + + + + + + mouse autocopy + + + + any text selected with the mouse will be automatically copied to the clipboard. - - - - - - x11-like single selection - - - - not implemented yet. - - - - - - vertical selections - - - - this + + + + + + x11-like single selection + + + + not implemented yet. + + + + + + vertical selections + + + + this activates the vertical selection option. - - - - - - toggle old - - - - not yet implemented - - - - - - - - - - - - - - - - edit + + + + + + toggle old + + + not yet implemented + + + + + + + + + edit - - - - - word wrap - - - - word wrap is a feature that causes the editor to + + + + + + word wrap + + + + 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 wrap words at: option. - - - - - - wrap words + + + + + + wrap words at: - - - - if the word wrap option is selected this entry + + + + if the word wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line. - - - - - - replace tabs by + + + + + + replace tabs by spaces - - - - kwrite will replace any tabs + + + + kwrite will replace any tabs with the number of spaces indicated in the tab width: entry. - - - - - - tab width - - - - if the replace tabs by spaces + + + + + + tab width + + + + if the replace tabs by spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs. - - - - - - remove trailing spaces - - - - kwrite will automatically eliminate extra spaces at the + + + + + + remove trailing spaces + + + + kwrite will automatically eliminate extra spaces at the ends of lines of text. - - - - - - auto brackets - - - - when the + + + + + + auto brackets + + + + when the user types a left bracket ([,(, or {) kwrite automatically enters the right bracket (}, ), or ]) to the right of the cursor. - - - - - - group undos - - - - groups of similar actions are to be considered a single + + + + + + group undos + + + + groups of similar actions are to be considered a single undo 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 @@ -2140,7 +2050,7 @@ series of character entries were interrupted by a non-character entry operation (such as a backspace), invoking undo would only remove the entries made since that operation. the next undo would then reverse that operation and so on. - when this option is not selected kwrite considers + when this option is not selected kwrite considers each keystroke to be a single step. so if the user (with this option active) were to type several words or even sentences without having to make corrections or cut or paste or some other non-character entry operation @@ -2150,37 +2060,37 @@ 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. - - - - - - show tabs - - - - the editor will display a symbol to indicate the presence + + + + + + show tabs + + + + the editor will display a symbol to indicate the presence of a tab in the text. - - - - - - smart home - - - - not yet implemented - - - - - - page up/down moves cursor - - - - this option changes the behavior of the cursor when + + + + + + smart home + + + + not yet implemented + + + + + + page up/down moves cursor + + + + this option changes the behavior of the cursor when the user presses the page up or page down 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 @@ -2188,16 +2098,16 @@ the cursor is in the middle of the visible text when the operation occurs it wil 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. - - - - - - wrap cursor - - - - when this option is chosen, moving + + + + + + wrap cursor + + + + 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 @@ -2205,117 +2115,109 @@ 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. - - - - - - undo steps: - - - - here + + + + + + undo steps: + + + + 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>, click the undo button 10 times and obtain results. - - - - - - - - - - - - - - - - spelling - + + + + + + + + + spelling - a spell checker is a program designed to + + 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. - - - - - create root/affix combinations not in + + + + + create root/affix combinations not in dictionary - - - - selecting this option allows + + + + 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. - - - - - - consider run-together words as spelling + + + + + + consider run-together words as spelling errors - - - - selecting this will cause the + + + + 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. - - - - - - dictionary: - - - - depending on + + + + + + dictionary: + + + + 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. - - - - - - encoding: - - - - there are + + + + + + encoding: + + + + 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. - - - - - - client: - - - - since kwrite + + + + + + client: + + + + 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. - - - - - + + + + @@ -2341,8 +2243,8 @@ modes. the user can select which page to view by clicking on the appropriate tab at the top of the dialog items available on the defaults page are as follows: - - + + default item styles @@ -2354,8 +2256,8 @@ this would allow a programmer to more easily identify different items (types of entries) in his or her code. - - + + item @@ -2371,7 +2273,7 @@ selected as needed. the options in the rest of this section apply to the entry selected in this box. - + normal @@ -2383,7 +2285,7 @@ to the entry selected in this box. dialog box, a further explanation of which may be found in the colors section of configure kwrite. - + bold @@ -2394,7 +2296,7 @@ dialog box, a further explanation of which may be found in the - + italic @@ -2405,7 +2307,7 @@ bold text. text. - + selected @@ -2420,7 +2322,7 @@ dialog box, a further explanation of which may be found in the - + default font @@ -2429,8 +2331,8 @@ dialog box, a further explanation of which may be found in the here the user can choose the default font for all text. - - + + family @@ -2442,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. - + size @@ -2453,7 +2355,7 @@ amount of space as an i) may be the best choice. points. - + charset @@ -2472,8 +2374,8 @@ more specific highlighting depending on the language style. one need not set every available option, items not configured specifically will use the default configuration specified on the previous (defaults tab. - - + + config select @@ -2483,8 +2385,8 @@ specifically will use the default configuration specified on the previous 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. - - + + highlight @@ -2495,7 +2397,7 @@ other areas of this dialog apply only to this type. configure - + item @@ -2518,7 +2420,7 @@ defaults page of this dialog box while leaving highlight modes page. - + item style @@ -2534,7 +2436,7 @@ selected, bold and italic. - + highlight auto select @@ -2550,7 +2452,7 @@ language is *.cpp;*.cc;*.c;* foo.h would automatically apply the c++ style to it. - + item font @@ -2588,8 +2490,8 @@ the defaults tab. kwrite copyright 2000 by jochen wilhelmy <digisnap@cs.tu-berlin.de> contributions: - - + + • @@ -2597,7 +2499,7 @@ the defaults tab. additional contributions by glen parker <glenebob@nwlink.com> - + • @@ -2607,8 +2509,8 @@ the defaults tab. documentation by thad mcginnis <ctmcginnis@compuserve.com> - - + + • diff --git a/tests/docbook/result/fo/multilingual.fo b/tests/docbook/result/fo/multilingual.fo index e79ab3b..dfd3a5e 100644 --- a/tests/docbook/result/fo/multilingual.fo +++ b/tests/docbook/result/fo/multilingual.fo @@ -81,7 +81,7 @@ - + @@ -205,7 +205,7 @@ Capítol 1. Catalan - + Nota This paragraph would be in Catalan, if I knew any. @@ -254,7 +254,7 @@ See Bibliography. Kapitola 2. Czech - + Poznámka This paragraph would be in Czech, if I knew any. @@ -303,7 +303,7 @@ See Bibliography. Kapitel 3. Danish - + Note This paragraph would be in Danish, if I knew any. @@ -352,7 +352,7 @@ See Bibliography. Capítulo 4. Spanish - + Nota This paragraph would be in Spanish, if I knew any. @@ -401,7 +401,7 @@ See Bibliography. Luku 5. Finnish - + Huomaa This paragraph would be in Finnish, if I knew any. @@ -450,7 +450,7 @@ See Bibliography. Chapitre 6. French - + Note This paragraph would be in French, if I knew any. @@ -499,7 +499,7 @@ See Bibliography. Capitolo 7. Italian - + Nota This paragraph would be in Italian, if I knew any. @@ -548,7 +548,7 @@ See Bibliography. Kapitel 8. German - + Anmerkung This paragraph would be in German, if I knew any. @@ -597,7 +597,7 @@ See Bibliography. ÊåöÜëáéï 9. Greek - + Óçìåßùóç This paragraph would be in Greek, if I knew any. @@ -646,7 +646,7 @@ See Bibliography. Chapter 10. English - + Note This paragraph is in English. @@ -695,7 +695,7 @@ See Bibliography. 第11章 - + 注意 This paragraph would be in Japanese, if I knew any. @@ -744,7 +744,7 @@ See Bibliography. Cap. 12. Romanian - + Notã This paragraph would be in Romanian, if I knew any. @@ -793,7 +793,7 @@ See Bibliography. Глава 13. Russian - + Замечание This paragraph would be in Russian, if I knew any. @@ -842,7 +842,7 @@ See Bibliography. Kapittel 14. Norsk - + Notat This paragraph would be in Norsk, if I knew any. @@ -891,7 +891,7 @@ See Bibliography. Hoofdstuk 15. Dutch - + Opmerking This paragraph would be in Dutch, if I knew any. @@ -940,7 +940,7 @@ See Bibliography. Rozdział 16. Polish - + Notatka This paragraph would be in Polish, if I knew any. @@ -989,7 +989,7 @@ See Bibliography. Capítulo 17. Portuguese - + Nota This paragraph would be in Portugeuse, if I knew any. @@ -1038,7 +1038,7 @@ See Bibliography. Capítulo 18. Portuguese (Brazilian) - + Nota This paragraph would be in Brazilian Portugeuse, if I knew any. @@ -1087,7 +1087,7 @@ See Bibliography. Kapitola 19. Slovak - + Poznámka This paragraph would be in Slovak, if I knew any. @@ -1136,7 +1136,7 @@ See Bibliography. Kapitel 20. Swedish - + Not This paragraph would be in Swedish, if I knew any. @@ -1180,7 +1180,7 @@ See Bibliography. Bibliography - + [AhoSethiUllman96] Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. Compilers, Principles, Techniques, and Tools. diff --git a/tests/docbook/result/fo/qa.fo b/tests/docbook/result/fo/qa.fo index ef8cf00..e8f2968 100644 --- a/tests/docbook/result/fo/qa.fo +++ b/tests/docbook/result/fo/qa.fo @@ -81,7 +81,7 @@ - + @@ -103,28 +103,28 @@ 1 chapter test - + Section title - + A appendix test - + Section title - + - + Chapter 1. chapter test @@ -141,18 +141,18 @@ Chapter 1. chapter test - + Q&A Set (unspecified) - + Q&A Div 1 - - + + @@ -161,8 +161,8 @@ Question para 2 - - + + @@ -174,14 +174,14 @@ - + Q&A Div 2 - - + + @@ -189,8 +189,8 @@ Question para 2 - - + + @@ -198,8 +198,8 @@ Answer para 2 - - + + @@ -207,8 +207,8 @@ Question para 2 - - + + @@ -220,18 +220,18 @@ - + Q&A Set (none) - + Q&A Div 1 - - + + @@ -240,8 +240,8 @@ Question para 2 - - + + @@ -253,14 +253,14 @@ - + Q&A Div 2 - - + + @@ -268,8 +268,8 @@ Question para 2 - - + + @@ -277,8 +277,8 @@ Answer para 2 - - + + @@ -286,8 +286,8 @@ Question para 2 - - + + @@ -299,18 +299,18 @@ - + Q&A Set (number) - + Q&A Div 1 - - + + 1.1. @@ -319,8 +319,8 @@ Question para 2 - - + + @@ -332,14 +332,14 @@ - + Q&A Div 2 - - + + 2.1. @@ -347,8 +347,8 @@ Question para 2 - - + + @@ -356,8 +356,8 @@ Answer para 2 - - + + 2.2. @@ -365,8 +365,8 @@ Question para 2 - - + + @@ -378,18 +378,18 @@ - + Q&A Set (qanda) - + Q&A Div 1 - - + + Q: @@ -398,8 +398,8 @@ Question para 2 - - + + @@ -411,14 +411,14 @@ - + Q&A Div 2 - - + + Q: @@ -426,8 +426,8 @@ Question para 2 - - + + @@ -435,8 +435,8 @@ Answer para 2 - - + + Q: @@ -444,8 +444,8 @@ Question para 2 - - + + @@ -457,341 +457,334 @@ - - - - - - - - - - - Section title - + + + + + Section title - - - Q&A Set (unspecified) + + + + Q&A Set (unspecified) + + + + Q&A Div 1 + + + + + + + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (none) + + + + Q&A Set (none) + + + + Q&A Div 1 + + + + + + + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (number) + + + + Q&A Set (number) + + + + Q&A Div 1 - - - Q&A Div 1 - - - - - - 1.1. - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + + 1.1. + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 2 - - - - - - 2.1. - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - 2.2. - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 + + + + + + 2.1. + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + 2.2. + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (qanda) + + + + Q&A Set (qanda) + + + + Q&A Div 1 + + + + + + Q: + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - Q: - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - Q: - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - Q: - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + Q: + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + Q: + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - + + - + Appendix A. appendix test @@ -808,18 +801,18 @@ Appendix A. appendix test - + Q&A Set (unspecified) - + Q&A Div 1 - - + + @@ -828,8 +821,8 @@ Question para 2 - - + + @@ -841,14 +834,14 @@ - + Q&A Div 2 - - + + @@ -856,8 +849,8 @@ Question para 2 - - + + @@ -865,8 +858,8 @@ Answer para 2 - - + + @@ -874,8 +867,8 @@ Question para 2 - - + + @@ -887,18 +880,18 @@ - + Q&A Set (none) - + Q&A Div 1 - - + + @@ -907,8 +900,8 @@ Question para 2 - - + + @@ -920,14 +913,14 @@ - + Q&A Div 2 - - + + @@ -935,8 +928,8 @@ Question para 2 - - + + @@ -944,8 +937,8 @@ Answer para 2 - - + + @@ -953,8 +946,8 @@ Question para 2 - - + + @@ -966,18 +959,18 @@ - + Q&A Set (number) - + Q&A Div 1 - - + + 1.1. @@ -986,8 +979,8 @@ Question para 2 - - + + @@ -999,14 +992,14 @@ - + Q&A Div 2 - - + + 2.1. @@ -1014,8 +1007,8 @@ Question para 2 - - + + @@ -1023,8 +1016,8 @@ Answer para 2 - - + + 2.2. @@ -1032,8 +1025,8 @@ Question para 2 - - + + @@ -1045,18 +1038,18 @@ - + Q&A Set (qanda) - + Q&A Div 1 - - + + Q: @@ -1065,8 +1058,8 @@ Question para 2 - - + + @@ -1078,14 +1071,14 @@ - + Q&A Div 2 - - + + Q: @@ -1093,8 +1086,8 @@ Question para 2 - - + + @@ -1102,8 +1095,8 @@ Answer para 2 - - + + Q: @@ -1111,8 +1104,8 @@ Question para 2 - - + + @@ -1124,338 +1117,331 @@ - - - - - - - - - - - Section title - + + + + + Section title - - - Q&A Set (unspecified) + + + + Q&A Set (unspecified) + + + + Q&A Div 1 + + + + + + + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (none) + + + + Q&A Set (none) + + + + Q&A Div 1 - - - Q&A Div 1 - - - - - - - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + + + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 2 - - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 + + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (number) + + + + Q&A Set (number) + + + + Q&A Div 1 + + + + + + 1.1. + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - 1.1. - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - 2.1. - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - 2.2. - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + 2.1. + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + 2.2. + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - - Q&A Set (qanda) + + + + Q&A Set (qanda) + + + + Q&A Div 1 + + + + + + Q: + + + <label>Q1</label> + Question para 1 + Question para 2 + + + + + + + + <label>A1</label> + Answer para 1 + Answer para 2 + + + - - - Q&A Div 1 - - - - - - Q: - - - <label>Q1</label> - Question para 1 - Question para 2 - - - - - - - - <label>A1</label> - Answer para 1 - Answer para 2 - - - - + + + + Q&A Div 2 - - - Q&A Div 2 - - - - - - Q: - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - - Q: - - - Question para 1 - Question para 2 - - - - - - - - Answer para 1 - Answer para 2 - - - - + + + + + Q: + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + + + Q: + + + Question para 1 + Question para 2 + + + + + + + + Answer para 1 + Answer para 2 + + + - - + + diff --git a/tests/docbook/result/fo/qa2.fo b/tests/docbook/result/fo/qa2.fo index e1dedcb..aa83717 100644 --- a/tests/docbook/result/fo/qa2.fo +++ b/tests/docbook/result/fo/qa2.fo @@ -81,7 +81,7 @@ - + @@ -103,12 +103,12 @@ 1 chapter test - + - + Chapter 1. chapter test @@ -127,17 +127,17 @@ Test a cross reference to a question: Q: <label>Q1</label>. - + Q&A Set (unspecified) - + Q&A Div 1 - + @@ -147,7 +147,7 @@ Question para 2 - + @@ -160,14 +160,14 @@ - + Q&A Div 2 - - + + @@ -175,8 +175,8 @@ Question para 2 - - + + @@ -184,8 +184,8 @@ Answer para 2 - - + + @@ -193,8 +193,8 @@ Question para 2 - - + + diff --git a/tests/docbook/result/fo/sectest.fo b/tests/docbook/result/fo/sectest.fo index 4ae2dd4..cce3370 100644 --- a/tests/docbook/result/fo/sectest.fo +++ b/tests/docbook/result/fo/sectest.fo @@ -131,7 +131,7 @@ Preface Title - + 1 XRef Tests @@ -140,17 +140,17 @@ Section 1 Title - + Section 1 Title - + - + @@ -168,7 +168,7 @@ of the dedication. This is the third para of the dedication. - + @@ -331,632 +331,618 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - - - - - - - - - - - Section 1 Title - + + + + + Section 1 Title - blah blah blah blah blah blah blah blah blah blah blah blah + + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - - - - - - - - - - - - - Section 1 Title - + + + + + + Section 1 Title - blah blah blah blah blah blah blah blah blah blah blah blah + + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah - blah blah blah blah blah blah blah blah blah blah blah blah + blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah 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/fo/set.fo b/tests/docbook/result/fo/set.fo index b346b27..38df343 100644 --- a/tests/docbook/result/fo/set.fo +++ b/tests/docbook/result/fo/set.fo @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -119,7 +119,7 @@ Foreword - + 1 Section Tests @@ -128,39 +128,39 @@ First Sect1 - + Second Sect1 - + Third Sect1 - + A First Appendix - + First Sect1 - + Second Sect1 - + Third Sect1 - + - + @@ -192,60 +192,39 @@ Chapter 1. Section Tests - - - - - - - - - - - First Sect1 - + + + + + First Sect1 - Paragraph. - - - - - - - - - - - - - Second Sect1 - + + Paragraph. + + + + + + Second Sect1 - Paragraph. - - - - - - - - - - - - - Third Sect1 - + + Paragraph. + + + + + + Third Sect1 - Paragraph. - - + + Paragraph. + - + Appendix A. First Appendix @@ -263,60 +242,39 @@ This is just a test. - - - - - - - - - - - First Sect1 - + + + + + First Sect1 - Paragraph. - - - - - - - - - - - - - Second Sect1 - + + Paragraph. + + + + + + Second Sect1 - Paragraph. - - - - - - - - - - - - - Third Sect1 - + + Paragraph. + + + + + + Third Sect1 - Paragraph. - - + + Paragraph. + - + @@ -345,34 +303,34 @@ Foreword - + 1 Section Tests - + First Sect1 - + Second Sect1 - + Third Sect1 - + A First Appendix - + - + @@ -387,7 +345,7 @@ This is a test paragraph. - + Chapter 1. Section Tests @@ -404,60 +362,39 @@ Chapter 1. Section Tests - - - - - - - - - - - First Sect1 - + + + + + First Sect1 - Paragraph. - - - - - - - - - - - - - Second Sect1 - + + Paragraph. + + + + + + Second Sect1 - Paragraph. - - - - - - - - - - - - - Third Sect1 - + + Paragraph. + + + + + + Third Sect1 - Paragraph. - - + + Paragraph. + - + Appendix A. First Appendix diff --git a/tests/docbook/result/fo/table.fo b/tests/docbook/result/fo/table.fo index 21b32a4..0d5f02d 100644 --- a/tests/docbook/result/fo/table.fo +++ b/tests/docbook/result/fo/table.fo @@ -99,7 +99,7 @@ How many ° can you ©. - + A Table @@ -217,7 +217,7 @@ - + A Table @@ -335,7 +335,7 @@ - + A Table @@ -453,7 +453,7 @@ - + A Table diff --git a/tests/docbook/result/fo/test.fo b/tests/docbook/result/fo/test.fo index d0dd507..5ee1194 100644 --- a/tests/docbook/result/fo/test.fo +++ b/tests/docbook/result/fo/test.fo @@ -81,7 +81,7 @@ - + -- 2.7.4