From 291f747dd244d563e0054dea79e15f462125e181 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Mon, 24 Oct 2016 10:21:32 -0400 Subject: [PATCH] Convert stylesheets to be namespace-aware. --- xsl/assembly/assemble.xsl | 121 +- xsl/assembly/topic-maker-chunk.xsl | 7 +- xsl/assembly/topic-maker.xsl | 5 +- xsl/common/autoidx-kimber.xsl | 7 +- xsl/common/autoidx-kosek.xsl | 7 +- xsl/common/charmap.xsl | 5 +- xsl/common/common.xsl | 303 +-- xsl/common/entities.ent | 30 +- xsl/common/gentext.xsl | 53 +- xsl/common/insertfile.xsl | 24 +- xsl/common/l10n.xsl | 5 +- xsl/common/labels.xsl | 271 +-- xsl/common/pi.xsl | 3 +- xsl/common/refentry.xsl | 101 +- xsl/common/subtitles.xsl | 107 +- xsl/common/table.xsl | 65 +- xsl/common/targets.xsl | 45 +- xsl/common/titles.xsl | 315 +-- xsl/common/utility.xsl | 5 +- xsl/eclipse/eclipse.xsl | 61 +- xsl/eclipse/eclipse3.xsl | 5 +- xsl/epub/bin/spec/files/test_cust.xsl | 6 +- .../tools/obfuscate_regression_submission.xsl | 5 +- xsl/epub/bin/xslt/obfuscate.xsl | 5 +- xsl/epub/docbook.xsl | 465 ++-- xsl/epub3/chunk.xsl | 3 +- xsl/epub3/chunkfast.xsl | 8 +- xsl/epub3/docbook.xsl | 3 +- xsl/epub3/epub3-chunk-mods.xsl | 3 +- xsl/epub3/epub3-element-mods.xsl | 401 ++-- xsl/epub3/profile-chunk.xsl | 7 +- xsl/epub3/profile-docbook.xsl | 76 +- xsl/fo/admon.xsl | 22 +- xsl/fo/annotations.xsl | 8 +- xsl/fo/autoidx-kimber.xsl | 9 +- xsl/fo/autoidx-kosek.xsl | 9 +- xsl/fo/autoidx-ng.xsl | 6 +- xsl/fo/autoidx.xsl | 221 +- xsl/fo/autotoc.xsl | 174 +- xsl/fo/axf.xsl | 30 +- xsl/fo/biblio-iso690.xsl | 348 +-- xsl/fo/biblio.xsl | 314 +-- xsl/fo/block.xsl | 130 +- xsl/fo/callout.xsl | 39 +- xsl/fo/component.xsl | 138 +- xsl/fo/division.xsl | 116 +- xsl/fo/docbook.xsl | 49 +- xsl/fo/ebnf.xsl | 51 +- xsl/fo/fo-rtf.xsl | 5 +- xsl/fo/fo.xsl | 6 +- xsl/fo/footnote.xsl | 39 +- xsl/fo/fop.xsl | 24 +- xsl/fo/fop1.xsl | 56 +- xsl/fo/formal.xsl | 78 +- xsl/fo/glossary.xsl | 291 +-- xsl/fo/graphics.xsl | 73 +- xsl/fo/highlight.xsl | 151 +- xsl/fo/htmltbl.xsl | 94 +- xsl/fo/index.xsl | 110 +- xsl/fo/info.xsl | 8 +- xsl/fo/inline.xsl | 227 +- xsl/fo/keywords.xsl | 10 +- xsl/fo/lists.xsl | 280 +-- xsl/fo/math.xsl | 23 +- xsl/fo/pagesetup.xsl | 60 +- xsl/fo/passivetex.xsl | 6 +- xsl/fo/pi.xsl | 63 +- xsl/fo/ptc.xsl | 22 +- xsl/fo/publishers.xsl | 29 +- xsl/fo/qandaset.xsl | 104 +- xsl/fo/refentry.xsl | 138 +- xsl/fo/sections.xsl | 206 +- xsl/fo/spaces.xsl | 6 +- xsl/fo/synop.xsl | 372 ++-- xsl/fo/table.xsl | 199 +- xsl/fo/task.xsl | 30 +- xsl/fo/titlepage.xsl | 246 +-- xsl/fo/toc.xsl | 68 +- xsl/fo/verbatim.xsl | 35 +- xsl/fo/xep.xsl | 46 +- xsl/fo/xref.xsl | 227 +- xsl/highlighting/common.xsl | 235 ++- xsl/html/admon.xsl | 26 +- xsl/html/annotations.xsl | 26 +- xsl/html/autoidx-kimber.xsl | 9 +- xsl/html/autoidx-kosek.xsl | 11 +- xsl/html/autoidx-ng.xsl | 6 +- xsl/html/autoidx.xsl | 131 +- xsl/html/autotoc.xsl | 188 +- xsl/html/biblio-iso690.xsl | 348 +-- xsl/html/biblio.xsl | 318 +-- xsl/html/block.xsl | 112 +- xsl/html/callout.xsl | 39 +- xsl/html/changebars.xsl | 6 +- xsl/html/chunk-changebars.xsl | 5 +- xsl/html/chunk-code.xsl | 171 +- xsl/html/chunk-common.xsl | 563 ++--- xsl/html/chunk.xsl | 5 +- xsl/html/chunker.xsl | 5 +- xsl/html/chunkfast.xsl | 5 +- xsl/html/chunktoc.xsl | 97 +- xsl/html/component.xsl | 210 +- xsl/html/division.xsl | 72 +- xsl/html/docbook.xsl | 123 +- xsl/html/ebnf.xsl | 57 +- xsl/html/footnote.xsl | 49 +- xsl/html/formal.xsl | 72 +- xsl/html/glossary.xsl | 149 +- xsl/html/graphics.xsl | 137 +- xsl/html/highlight.xsl | 168 +- xsl/html/html.xsl | 42 +- xsl/html/htmltbl.xsl | 18 +- xsl/html/index.xsl | 106 +- xsl/html/info.xsl | 10 +- xsl/html/inline.xsl | 229 +- xsl/html/its.xsl | 215 +- xsl/html/keywords.xsl | 18 +- xsl/html/lists.xsl | 272 +-- xsl/html/maketoc.xsl | 11 +- xsl/html/manifest.xsl | 5 +- xsl/html/math.xsl | 55 +- xsl/html/oldchunker.xsl | 5 +- xsl/html/onechunk.xsl | 5 +- xsl/html/pi.xsl | 9 +- xsl/html/profile-chunk.xsl | 5 +- xsl/html/profile-onechunk.xsl | 5 +- xsl/html/publishers.xsl | 25 +- xsl/html/qandaset.xsl | 115 +- xsl/html/refentry.xsl | 114 +- xsl/html/sections.xsl | 228 +- xsl/html/synop.xsl | 488 ++--- xsl/html/table.xsl | 135 +- xsl/html/task.xsl | 30 +- xsl/html/titlepage.xsl | 212 +- xsl/html/toc.xsl | 88 +- xsl/html/verbatim.xsl | 31 +- xsl/html/xref.xsl | 233 +- xsl/htmlhelp/htmlhelp-common.xsl | 147 +- xsl/htmlhelp/htmlhelp.xsl | 5 +- xsl/htmlhelp/profile-htmlhelp.xsl | 5 +- xsl/javahelp/javahelp.xsl | 193 +- xsl/manpages/block.xsl | 79 +- xsl/manpages/charmap.groff.xsl | 5 +- xsl/manpages/docbook.xsl | 25 +- xsl/manpages/endnotes.xsl | 113 +- xsl/manpages/info.xsl | 209 +- xsl/manpages/inline.xsl | 54 +- xsl/manpages/lists.xsl | 142 +- xsl/manpages/other.xsl | 19 +- xsl/manpages/pi.xsl | 5 +- xsl/manpages/refentry.xsl | 100 +- xsl/manpages/synop.xsl | 69 +- xsl/manpages/table.xsl | 13 +- xsl/manpages/utility.xsl | 149 +- xsl/profiling/profile-mode.xsl | 5 +- xsl/profiling/profile.xsl | 8 +- xsl/profiling/strip-attributes.xsl | 6 +- xsl/profiling/xsl2profile.xsl | 17 +- xsl/roundtrip/blocks2dbk.xsl | 284 +-- xsl/roundtrip/dbk2ooo.xsl | 4 +- xsl/roundtrip/dbk2pages.xsl | 5 +- xsl/roundtrip/dbk2wordml.xsl | 17 +- xsl/roundtrip/dbk2wp.xsl | 551 ++--- xsl/roundtrip/normalise2sections.xsl | 101 +- xsl/roundtrip/pages2normalise.xsl | 29 +- xsl/roundtrip/sections2blocks.xsl | 31 +- xsl/roundtrip/wordml2normalise.xsl | 49 +- xsl/template/titlepage.xsl | 5 +- xsl/webhelp/xsl/titlepage.templates.xsl | 1869 +++++++++-------- xsl/webhelp/xsl/webhelp-common.xsl | 29 +- xsl/webhelp/xsl/webhelp.xsl | 5 +- xsl/xhtml5/chunk.xsl | 3 +- xsl/xhtml5/chunkfast.xsl | 3 +- xsl/xhtml5/docbook.xsl | 5 +- xsl/xhtml5/html5-chunk-mods.xsl | 11 +- xsl/xhtml5/html5-element-mods.xsl | 147 +- xsl/xhtml5/onechunk.xsl | 7 +- xsl/xhtml5/profile-chunk.xsl | 7 +- xsl/xhtml5/profile-docbook.xsl | 14 +- xsl/xhtml5/xhtml-profile-docbook.xsl | 76 +- xsl/xhtml5/xhtml2xhtml5.xsl | 6 +- 181 files changed, 9251 insertions(+), 8950 deletions(-) diff --git a/xsl/assembly/assemble.xsl b/xsl/assembly/assemble.xsl index cd28c1b9b..22e4db75a 100644 --- a/xsl/assembly/assemble.xsl +++ b/xsl/assembly/assemble.xsl @@ -1,14 +1,15 @@ - + @@ -37,18 +38,18 @@ - + - + - @@ -66,12 +67,12 @@ - - - + + - + @@ -95,24 +96,24 @@ - + ERROR: output.type param set to ' but no structure element has that type attribute. Exiting. - - + + - + - + @@ -126,7 +127,7 @@ - + @@ -136,18 +137,18 @@ - + - + - + @@ -167,7 +168,7 @@ - + @@ -195,7 +196,7 @@ + select="ancestor::d:structure/@defaultformat"/> @@ -203,30 +204,30 @@ and it has that property --> - + @@ -240,7 +241,7 @@ - + @@ -259,7 +260,7 @@ - + @@ -288,7 +289,7 @@ - + @@ -315,7 +316,7 @@ - + @@ -330,7 +331,7 @@ '. - + ERROR: xml:id matching @resourceref = ' @@ -360,9 +361,9 @@ - + @@ -440,7 +441,7 @@ - + @@ -478,7 +479,7 @@ - + @@ -520,7 +521,7 @@ '. - + ERROR: xml:id matching @resourceref = ' @@ -533,9 +534,9 @@ - + @@ -551,7 +552,7 @@ + select="exsl:node-set($merge.ref.content)//d:info[1]"/> @@ -574,18 +575,18 @@ - - - - - - - - + $ref.content/d:info/node() or + $ref.content/d:title[$omittitles.boolean = 0] or + $ref.content/d:subtitle[$omittitles.boolean = 0] or + $ref.content/d:titleabbrev[$omittitles.boolean = 0]"> + + + + + + + + @@ -649,28 +650,28 @@ - + WARNING: the <relationships> element is not currently supported by this stylesheet. - + WARNING: the <transforms> element is not currently supported by this stylesheet. - + WARNING: the <filterin> element is not currently supported by this stylesheet. - + WARNING: the <filterin> element is not currently supported by this stylesheet. diff --git a/xsl/assembly/topic-maker-chunk.xsl b/xsl/assembly/topic-maker-chunk.xsl index 8f411dd03..4554359e2 100644 --- a/xsl/assembly/topic-maker-chunk.xsl +++ b/xsl/assembly/topic-maker-chunk.xsl @@ -1,9 +1,10 @@ + exclude-result-prefixes="exsl d"> @@ -72,7 +73,7 @@ - + diff --git a/xsl/assembly/topic-maker.xsl b/xsl/assembly/topic-maker.xsl index 5938e53fa..25e64a601 100644 --- a/xsl/assembly/topic-maker.xsl +++ b/xsl/assembly/topic-maker.xsl @@ -1,9 +1,10 @@ diff --git a/xsl/common/autoidx-kosek.xsl b/xsl/common/autoidx-kosek.xsl index 7b6bf109a..9f8ae4f56 100644 --- a/xsl/common/autoidx-kosek.xsl +++ b/xsl/common/autoidx-kosek.xsl @@ -4,13 +4,14 @@ %common.entities; ]> @@ -203,11 +204,11 @@ Defaults to the context node. 5 - 6 - 5 - 4 - 3 - 2 + 6 + 5 + 4 + 3 + 2 1 @@ -222,16 +223,16 @@ Defaults to the context node. - 2 - 3 - 4 - 5 - 5 - + 2 + 3 + 4 + 5 + 5 + - 5 - 4 - 3 + 5 + 4 + 3 2 @@ -258,16 +259,16 @@ Defaults to the context node. + select="(ancestor::d:section + |ancestor::d:simplesect + |ancestor::d:sect5 + |ancestor::d:sect4 + |ancestor::d:sect3 + |ancestor::d:sect2 + |ancestor::d:sect1 + |ancestor::d:refsect3 + |ancestor::d:refsect2 + |ancestor::d:refsect1)[last()]"/> 1 @@ -288,7 +289,7 @@ Defaults to the context node. - + @@ -300,10 +301,10 @@ Defaults to the context node. 3 - 5 - 4 - 3 - 2 + 5 + 4 + 3 + 2 1 @@ -317,12 +318,12 @@ Defaults to the context node. + select="($node/ancestor::d:section | + $node/ancestor::d:sect1 | + $node/ancestor::d:sect2 | + $node/ancestor::d:sect3 | + $node/ancestor::d:sect4 | + $node/ancestor::d:sect5)[last()]"/> @@ -341,7 +342,7 @@ Defaults to the context node. - + @@ -408,17 +409,17 @@ Defaults to the context node. - - - + - - @@ -429,21 +430,21 @@ Defaults to the context node. - + - - + + - + - - + + - + @@ -492,9 +493,9 @@ Defaults to the context node. - + - + @@ -509,7 +510,7 @@ Defaults to the context node. - + @@ -537,13 +538,13 @@ Defaults to the context node. - + - + - + [FAMILY Given] @@ -551,48 +552,48 @@ Defaults to the context node. - + - + , - + - - + + - - + + - + - - + + - + - - + + - + - + , - + @@ -608,7 +609,7 @@ Defaults to the context node. John Doe, Jane Doe, and A. Nonymous --> + select="d:author|d:corpauthor|d:othercredit|d:editor"/> @@ -853,8 +854,8 @@ in the list is appropriate. + select="d:imageobject|d:imageobjectco + |d:videoobject|d:audioobject|d:textobject"/> @@ -916,8 +917,8 @@ recursive process. + select="d:imageobject|d:imageobjectco + |d:videoobject|d:audioobject|d:textobject"/> 1 @@ -979,23 +980,23 @@ recursive process. + ../d:imageobject or + ../d:audioobject or + ../d:videoobject"> 0 - 1 - + 0 + and $object/ancestor::d:equation "> 0 @@ -1007,8 +1008,8 @@ recursive process. - 0 @@ -1023,7 +1024,7 @@ recursive process. - + @@ -1091,9 +1092,9 @@ object is recognized as a graphic. - + @@ -1126,9 +1127,9 @@ object is recognized as a graphic. - @@ -1283,7 +1284,7 @@ pointed to by the link is one of the elements listed in + select="count($context/ancestor::d:substeps)"/> @@ -1296,7 +1297,7 @@ pointed to by the link is one of the elements listed in + select="count($context/ancestor::d:substeps)"/> @@ -1309,18 +1310,18 @@ pointed to by the link is one of the elements listed in - + - + - - + + @@ -1350,12 +1351,12 @@ pointed to by the link is one of the elements listed in + select="$list/preceding::d:orderedlist + [count($list/ancestor::d:orderedlist) = count(ancestor::d:orderedlist)][1]"/> 2 - + @@ -1375,10 +1376,10 @@ pointed to by the link is one of the elements listed in - + - + @@ -1413,11 +1414,11 @@ pointed to by the link is one of the elements listed in - + - + @@ -1430,10 +1431,10 @@ pointed to by the link is one of the elements listed in - + - + @@ -1459,9 +1460,9 @@ pointed to by the link is one of the elements listed in - - + @@ -1493,11 +1494,11 @@ pointed to by the link is one of the elements listed in - + - + diff --git a/xsl/common/entities.ent b/xsl/common/entities.ent index 427ef0dd8..93f20807e 100644 --- a/xsl/common/entities.ent +++ b/xsl/common/entities.ent @@ -22,11 +22,11 @@ If @sortas is not present, the first item is empty, and the added space is removed when normalize-space is applied, leaving just the entry --> - - - + + + - + @@ -52,14 +52,14 @@ '> - + diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl index a15e43781..38dc46e13 100644 --- a/xsl/common/gentext.xsl +++ b/xsl/common/gentext.xsl @@ -1,7 +1,8 @@ 0 - + @@ -234,7 +235,7 @@ - + + - + @@ -407,7 +408,7 @@ - + @@ -427,7 +428,7 @@ - %n + %n @@ -567,7 +568,7 @@ - + 1 diff --git a/xsl/common/insertfile.xsl b/xsl/common/insertfile.xsl index 310e30f83..94bd0496e 100644 --- a/xsl/common/insertfile.xsl +++ b/xsl/common/insertfile.xsl @@ -1,6 +1,8 @@ - - - + + - + @@ -69,15 +71,15 @@ - + - @@ -88,7 +90,7 @@ - diff --git a/xsl/common/l10n.xsl b/xsl/common/l10n.xsl index 83614c4e4..63a19630b 100644 --- a/xsl/common/l10n.xsl +++ b/xsl/common/l10n.xsl @@ -1,7 +1,8 @@ - + + ancestor::d:part"> - - @@ -99,32 +100,32 @@ element label. - - + + - + - + + ancestor::d:part"> - - @@ -136,32 +137,32 @@ element label. - - + + - + - + + ancestor::d:part"> - - @@ -173,45 +174,45 @@ element label. - - + + - + - + - + - + + ancestor::d:part"> - - @@ -223,24 +224,24 @@ element label. - - + + - + - + - + @@ -285,7 +286,7 @@ element label. @@ -299,12 +300,12 @@ element label. - + - + @@ -343,12 +344,12 @@ element label. - + - + @@ -378,16 +379,16 @@ element label. - + - + - + - + label.markup: this can't happen! @@ -397,11 +398,11 @@ element label. - + - + @@ -412,12 +413,12 @@ element label. - + - + @@ -441,17 +442,17 @@ element label. - + - + - + - + - + - - + + @@ -556,27 +557,27 @@ element label. - + - - + + @@ -585,13 +586,13 @@ element label. - + - + - @@ -608,7 +609,7 @@ element label. + select="ancestor-or-self::d:qandaset/@defaultlabel[1]"/> @@ -621,60 +622,60 @@ element label. - + - + - + + $deflabel = 'qnumberanda') and self::d:question">   - + - + - + - + - + - + + select="(ancestor::d:chapter + |ancestor::d:appendix + |ancestor::d:article[ancestor::d:book])[last()]"/> @@ -693,21 +694,21 @@ element label. - + - + - + + select="ancestor::d:chapter + |ancestor::d:appendix + |ancestor::d:article[ancestor::d:book]"/> @@ -731,23 +732,23 @@ element label. - + - + - + + select="ancestor::d:chapter + |ancestor::d:appendix + |ancestor::d:article[ancestor::d:book]"/> @@ -768,22 +769,22 @@ element label. - + - + - + - + @@ -812,23 +813,23 @@ element label. - - + + - + - + - + - + @@ -843,7 +844,7 @@ element label. - 0 + 0 diff --git a/xsl/common/pi.xsl b/xsl/common/pi.xsl index 39297685e..5178194c3 100644 --- a/xsl/common/pi.xsl +++ b/xsl/common/pi.xsl @@ -1,11 +1,12 @@ diff --git a/xsl/common/refentry.xsl b/xsl/common/refentry.xsl index 344206252..6fd898f16 100644 --- a/xsl/common/refentry.xsl +++ b/xsl/common/refentry.xsl @@ -1,8 +1,9 @@ - + + select="(($info[d:date])[last()]/d:date)[1]| + (($info[d:pubdate])[last()]/d:pubdate)[1]"/> @@ -687,85 +688,85 @@ - + + select="d:refmeta/d:refmiscinfo[@class = 'source' or @class='software'][1]/node()"/> - + + select="($info[d:productname])[last()]"/> + select="(($info[d:productname])[last()]/d:productname)[1]"/> source - + + select="($info[d:corpname])[last()]"/> + select="(($info[d:corpname])[last()]/d:corpname)[1]"/> source productname - + + select="($info[d:corpcredit])[last()]"/> + select="(($info[d:corpcredit])[last()]/d:corpcredit)[1]"/> source productname - + + select="($info[d:corpauthor])[last()]"/> + select="(($info[d:corpauthor])[last()]/d:corpauthor)[1]"/> source productname - + + select="($info[//d:orgname])[last()]"/> + select="(($info[//d:orgname])[last()]//d:orgname)[1]"/> source productname - + + select="($info[//d:publishername])[last()]"/> + select="(($info[//d:publishername])[last()]//d:publishername)[1]"/> source productname @@ -871,46 +872,46 @@ - + + select="d:refmeta/d:refmiscinfo[@class = 'version'][1]/node()"/> - + + select="($info[d:productnumber])[last()]"/> + select="(($info[d:productnumber])[last()]/d:productnumber)[1]"/> version - + + select="($info[d:edition])[last()]"/> + select="(($info[d:edition])[last()]/d:edition)[1]"/> version productnumber - + + select="($info[d:releaseinfo])[last()]"/> + select="(($info[d:releaseinfo])[last()]/d:releaseinfo)[1]"/> version productnumber @@ -1053,9 +1054,9 @@ - + + select="d:refmeta/d:refmiscinfo[@class = 'manual' or @class = 'sectdesc'][1]/node()"/> @@ -1063,27 +1064,27 @@ - + + select="(ancestor::*[d:title])[1]"/> + select="(ancestor::*[d:title])[1]/d:title"/> manual - + + select="($info[d:title])[1]"/> + select="(($info[d:title])[1]/d:title)[1]"/> manual diff --git a/xsl/common/subtitles.xsl b/xsl/common/subtitles.xsl index 3848cd9d3..a6390a1a9 100644 --- a/xsl/common/subtitles.xsl +++ b/xsl/common/subtitles.xsl @@ -1,7 +1,8 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -296,7 +297,7 @@ document output. - + @@ -306,17 +307,17 @@ document output. - + - - + + - + diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl index e2975745d..51b1fb0f7 100644 --- a/xsl/common/titles.xsl +++ b/xsl/common/titles.xsl @@ -1,8 +1,9 @@ - - + + @@ -76,7 +77,7 @@ title of the element. This does not include the label. - + @@ -90,7 +91,7 @@ title of the element. This does not include the label. - + @@ -103,31 +104,31 @@ title of the element. This does not include the label. - + - - + - - + - - + - + - + - - + + @@ -165,11 +166,11 @@ title of the element. This does not include the label. - + - - + + @@ -181,11 +182,11 @@ title of the element. This does not include the label. - + - - + + @@ -197,33 +198,33 @@ title of the element. This does not include the label. - + - + - + - - + - - - - - + + + + + @@ -243,7 +244,7 @@ title of the element. This does not include the label. - + @@ -255,40 +256,40 @@ title of the element. This does not include the label. - - + - + - + - - + + @@ -300,9 +301,9 @@ title of the element. This does not include the label. - + - + @@ -317,9 +318,9 @@ title of the element. This does not include the label. - + - + @@ -334,9 +335,9 @@ title of the element. This does not include the label. - + - + @@ -349,14 +350,14 @@ title of the element. This does not include the label. - + - + - + @@ -369,9 +370,9 @@ title of the element. This does not include the label. - + - + @@ -386,9 +387,9 @@ title of the element. This does not include the label. - + - + @@ -403,47 +404,47 @@ title of the element. This does not include the label. - + - + - + - + - + - + - + - + - + - - + - - + + @@ -455,9 +456,9 @@ title of the element. This does not include the label. - + - + @@ -480,30 +481,30 @@ title of the element. This does not include the label. - + question - + answer - + - + - + - + @@ -518,11 +519,11 @@ title of the element. This does not include the label. - + - - + + @@ -537,20 +538,20 @@ title of the element. This does not include the label. - + - - + + - - + + @@ -563,19 +564,19 @@ title of the element. This does not include the label. - + - + @@ -592,14 +593,14 @@ title of the element. This does not include the label. - + - + @@ -616,26 +617,26 @@ title of the element. This does not include the label. - - + @@ -652,7 +653,7 @@ title of the element. This does not include the label. - + @@ -670,14 +671,14 @@ title of the element. This does not include the label. - + @@ -687,15 +688,15 @@ title of the element. This does not include the label. - + - + - + @@ -707,7 +708,7 @@ title of the element. This does not include the label. - + @@ -737,15 +738,15 @@ title of the element. This does not include the label. - + - + - + @@ -830,12 +831,12 @@ title of the element. This does not include the label. - + - - + + diff --git a/xsl/common/utility.xsl b/xsl/common/utility.xsl index 87cfb7ee9..83ee04193 100644 --- a/xsl/common/utility.xsl +++ b/xsl/common/utility.xsl @@ -1,10 +1,11 @@ - + - + namespace-uri(/*) != 'http://docbook.org/ns/docbook'"> + @@ -32,15 +33,15 @@ + namespace-uri(/*) != 'http://docbook.org/ns/docbook'"> Note - namesp. cut + namesp. add - stripped namespace before processing + added namespace before processing - + - + - Unable to strip the namespace from DB5 document, + Unable to add the namespace from DB4 document, cannot proceed. @@ -174,7 +175,7 @@ - + @@ -194,7 +195,7 @@ - + @@ -252,26 +253,26 @@ - - - - + + + + - - - - + + + + - + - + @@ -281,27 +282,27 @@ - + ( - ) + ) - - + + - + - + - + diff --git a/xsl/eclipse/eclipse3.xsl b/xsl/eclipse/eclipse3.xsl index 5c09e7d2a..9809733b3 100644 --- a/xsl/eclipse/eclipse3.xsl +++ b/xsl/eclipse/eclipse3.xsl @@ -1,9 +1,10 @@ + exclude-result-prefixes="exsl db ng d"> diff --git a/xsl/epub/bin/xslt/obfuscate.xsl b/xsl/epub/bin/xslt/obfuscate.xsl index 4ea4cd557..575bb74be 100644 --- a/xsl/epub/bin/xslt/obfuscate.xsl +++ b/xsl/epub/bin/xslt/obfuscate.xsl @@ -1,5 +1,8 @@ - + diff --git a/xsl/epub/docbook.xsl b/xsl/epub/docbook.xsl index 6e6ed0009..29d7fc8e1 100644 --- a/xsl/epub/docbook.xsl +++ b/xsl/epub/docbook.xsl @@ -11,10 +11,11 @@ xmlns:str="http://exslt.org/strings" xmlns:date="http://exslt.org/dates-and-times" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:d="http://docbook.org/ns/docbook" xmlns:xtext="xalan://com.nwalsh.xalan.Text" extension-element-prefixes="date stext xtext" - exclude-result-prefixes="exsl date db dc h ncx ng opf stext str xtext" + exclude-result-prefixes="exsl date db dc h ncx ng opf stext str xtext d" version="1.0"> @@ -124,16 +125,16 @@ - + 1 - + 1 - + 1 - + 1 @@ -142,7 +143,7 @@ - + @@ -153,15 +154,15 @@ + namespace-uri(/*) != 'http://docbook.org/ns/docbook'"> Note - namesp. cut + namesp. add - stripped namespace before processing + added namespace before processing - + - + - Unable to strip the namespace from DB5 document, + Unable to add the namespace from DB4 document, cannot proceed. @@ -241,45 +242,45 @@ - - + urn: - + : - + - + urn:isbn: - + - + urn:issn: - + - - + + - - + + - - + + - - + + - - + + - - + + _ @@ -340,7 +341,7 @@ - + cover @@ -417,7 +418,7 @@ type="cover" pointing to it AND there is a logical cover specified in a tag, THEN, the HTML cover is discarded. --> - + cover @@ -496,26 +497,26 @@ - @@ -543,25 +544,25 @@ + count(preceding::d:part| + preceding::d:reference| + preceding::d:book[parent::d:set]| + preceding::d:preface| + preceding::d:chapter| + preceding::d:bibliography| + preceding::d:appendix| + preceding::d:article| + preceding::d:glossary| + preceding::d:section[not(parent::d:partintro)]| + preceding::d:sect1[not(parent::d:partintro)]| + preceding::d:sect2[not(ancestor::d:partintro)]| + preceding::d:sect3[not(ancestor::d:partintro)]| + preceding::d:sect4[not(ancestor::d:partintro)]| + preceding::d:sect5[not(ancestor::d:partintro)]| + preceding::d:refentry| + preceding::d:colophon| + preceding::d:bibliodiv[d:title]| + preceding::d:index)"/> @@ -571,7 +572,7 @@ - + @@ -590,7 +591,7 @@ - + @@ -599,11 +600,11 @@ - - + + - + @@ -622,7 +623,7 @@ - + @@ -651,20 +652,20 @@ - + - + - - + + : - + - + : @@ -674,38 +675,38 @@ - - + + - + - - + + - + - + - + - + - + @@ -720,7 +721,7 @@ - + @@ -728,10 +729,10 @@ + $info/d:cover or + $info//d:mediaobject[@role='cover' or ancestor::d:cover]"> - + @@ -787,7 +788,7 @@ + select="$info//d:mediaobject[@role='cover' or ancestor::d:cover]"/> @@ -850,7 +851,7 @@ - + @@ -878,36 +879,36 @@ - @@ -919,7 +920,7 @@ - + @@ -988,12 +989,12 @@ - - + @@ -1005,48 +1006,48 @@ - - - - - - + - - WARNING: mediaobjectco almost certainly will not render as expected in .epub! - @@ -1054,9 +1055,9 @@ - @@ -1090,13 +1091,13 @@ - + - + - + @@ -1114,9 +1115,9 @@ - @@ -1144,13 +1145,13 @@ - + - + - + @@ -1172,31 +1173,31 @@ need further tweaking to ensure _never_ dropping generated content (XHTML) from the manifest (OPF file) --> @@ -1227,8 +1228,8 @@ - - + + @@ -1338,8 +1339,8 @@ - - + + (missing alt) @@ -1408,39 +1409,39 @@ cfs: ps: - + prs: - + --> 1 - + 1 - + - + - + - + - + @@ -1470,20 +1471,20 @@ - @@ -1499,7 +1500,7 @@ - + @@ -1547,10 +1548,10 @@ - + - + @@ -1575,18 +1576,18 @@ - - + + - + - - + + @@ -1607,10 +1608,10 @@ - + - + @@ -1655,7 +1656,7 @@ - + @@ -1709,14 +1710,14 @@ - - + + 1 - + @@ -1758,14 +1759,14 @@ - - + + - 6 - 5 - 4 - 3 - 2 + 6 + 5 + 4 + 3 + 2 1 diff --git a/xsl/epub3/chunk.xsl b/xsl/epub3/chunk.xsl index c9588d327..59e8462f4 100644 --- a/xsl/epub3/chunk.xsl +++ b/xsl/epub3/chunk.xsl @@ -1,9 +1,10 @@ - + - + 1 - + 1 - + 1 - + 1 @@ -465,7 +466,7 @@ article toc,title,figure,table,example,equation + select="$info//d:mediaobject[@role='cover' or ancestor::d:cover]"/> @@ -488,21 +489,21 @@ article toc,title,figure,table,example,equation - + - + - + - - + + - - + + @@ -532,11 +533,11 @@ article toc,title,figure,table,example,equation - + - - + + @@ -587,7 +588,7 @@ article toc,title,figure,table,example,equation - + dcterms:contributor @@ -600,19 +601,19 @@ article toc,title,figure,table,example,equation - + - - + + - - + + - - + + - + @@ -634,7 +635,7 @@ article toc,title,figure,table,example,equation - + @@ -643,7 +644,7 @@ article toc,title,figure,table,example,equation - + dcterms:date @@ -704,20 +705,20 @@ article toc,title,figure,table,example,equation - + - + - - + + : - + - + : @@ -738,11 +739,11 @@ article toc,title,figure,table,example,equation - - + + - + dcterms:subject @@ -755,11 +756,11 @@ article toc,title,figure,table,example,equation - - + + - + dcterms:subject @@ -772,11 +773,11 @@ article toc,title,figure,table,example,equation - - + + - + dcterms:publisher @@ -789,7 +790,7 @@ article toc,title,figure,table,example,equation - + dcterms:coverage @@ -802,7 +803,7 @@ article toc,title,figure,table,example,equation - + dcterms:relation @@ -815,7 +816,7 @@ article toc,title,figure,table,example,equation - + dcterms:source @@ -828,22 +829,22 @@ article toc,title,figure,table,example,equation - + - + - + - + @@ -870,7 +871,7 @@ article toc,title,figure,table,example,equation - + @@ -885,7 +886,7 @@ article toc,title,figure,table,example,equation dcterms:rightsHolder - + @@ -901,11 +902,11 @@ article toc,title,figure,table,example,equation + $info/d:cover or + $info//d:mediaobject[@role='cover' or ancestor::d:cover]"> - + @@ -936,46 +937,46 @@ article toc,title,figure,table,example,equation - - + + urn: - + : - + - + urn:isbn: - + - + urn:issn: - + - - + + - - + + - - + + - - + + - - + + - - + + _ @@ -1012,23 +1013,23 @@ article toc,title,figure,table,example,equation - + @@ -1038,36 +1039,36 @@ article toc,title,figure,table,example,equation - + subchapter - + division - + notice - + list - + list-item @@ -1304,14 +1305,14 @@ article toc,title,figure,table,example,equation + select="$info//d:mediaobject[@role='cover' or ancestor::d:cover]"/> - + @@ -1432,7 +1433,7 @@ article toc,title,figure,table,example,equation - @@ -1502,24 +1503,24 @@ article toc,title,figure,table,example,equation + select="$this.chunk//d:mediaobject"/> + select="$next.chunk/preceding::d:mediaobject"/> - + - svg @@ -1532,18 +1533,18 @@ article toc,title,figure,table,example,equation + select="$this.chunk//d:mediaobject"/> - + - svg @@ -1658,22 +1659,22 @@ article toc,title,figure,table,example,equation - - - + + select="d:imageobject[not(@role = 'poster')] + |d:imageobjectco + |d:videoobject + |d:audioobject + |d:textobject"/> @@ -1687,15 +1688,15 @@ article toc,title,figure,table,example,equation - + - + - + @@ -1738,7 +1739,7 @@ article toc,title,figure,table,example,equation - + @@ -1764,7 +1765,7 @@ article toc,title,figure,table,example,equation - + @@ -1799,7 +1800,7 @@ article toc,title,figure,table,example,equation - + @@ -1863,7 +1864,7 @@ article toc,title,figure,table,example,equation type="cover" pointing to it AND there is a logical cover specified in a tag, THEN, the HTML cover is discarded. --> - + cover @@ -1943,27 +1944,27 @@ article toc,title,figure,table,example,equation - @@ -1991,26 +1992,26 @@ article toc,title,figure,table,example,equation + count(preceding::d:part| + preceding::d:reference| + preceding::d:book[parent::d:set]| + preceding::d:preface| + preceding::d:chapter| + preceding::d:bibliography| + preceding::d:appendix| + preceding::d:article| + preceding::d:topic| + preceding::d:glossary| + preceding::d:section[not(parent::d:partintro)]| + preceding::d:sect1[not(parent::d:partintro)]| + preceding::d:sect2[not(ancestor::d:partintro)]| + preceding::d:sect3[not(ancestor::d:partintro)]| + preceding::d:sect4[not(ancestor::d:partintro)]| + preceding::d:sect5[not(ancestor::d:partintro)]| + preceding::d:refentry| + preceding::d:colophon| + preceding::d:bibliodiv[d:title]| + preceding::d:index)"/> @@ -2020,7 +2021,7 @@ article toc,title,figure,table,example,equation - + @@ -2042,7 +2043,7 @@ article toc,title,figure,table,example,equation - + @@ -2092,7 +2093,7 @@ article toc,title,figure,table,example,equation + select="$info//d:mediaobject[@role='cover' or ancestor::d:cover]"/> @@ -2125,7 +2126,7 @@ article toc,title,figure,table,example,equation - + @@ -2177,7 +2178,7 @@ article toc,title,figure,table,example,equation - + @@ -2202,18 +2203,18 @@ article toc,title,figure,table,example,equation - - + + - + - - + + @@ -2227,7 +2228,7 @@ article toc,title,figure,table,example,equation - + @@ -2258,7 +2259,7 @@ article toc,title,figure,table,example,equation - +
@@ -2311,7 +2312,7 @@ article toc,title,figure,table,example,equation - + @@ -2357,12 +2358,12 @@ article toc,title,figure,table,example,equation - + - + 1 2 @@ -2376,7 +2377,7 @@ article toc,title,figure,table,example,equation - + 2 3 @@ -2497,7 +2498,7 @@ article toc,title,figure,table,example,equation - + @@ -2520,14 +2521,14 @@ article toc,title,figure,table,example,equation - + - - - - - + + + + + @@ -2556,7 +2557,7 @@ article toc,title,figure,table,example,equation - - + diff --git a/xsl/epub3/profile-chunk.xsl b/xsl/epub3/profile-chunk.xsl index 38ff4803d..4e6cc75c3 100644 --- a/xsl/epub3/profile-chunk.xsl +++ b/xsl/epub3/profile-chunk.xsl @@ -1,7 +1,12 @@ - + - + @@ -67,7 +79,7 @@ - + @@ -142,11 +154,11 @@ - - + + - + @@ -199,30 +211,30 @@ body { background-image: url(' - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -238,12 +250,12 @@ body { background-image: url(' in this chunk should be referenced. I don't think it does any harm to reference them all, but it adds unnecessary bloat to each chunk. --> - +