From: Steve Ball Date: Fri, 11 Nov 2005 05:18:16 +0000 (+0000) Subject: added blocks stylesheet to support bibliographies, glossaries and qandasets X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa4fddc33da6bba57b571feb9f31c7ec583fe5ed;p=docbook-dsssl added blocks stylesheet to support bibliographies, glossaries and qandasets --- diff --git a/xsl/wordml/Makefile b/xsl/wordml/Makefile index bf6c563a1..9d7d9285c 100644 --- a/xsl/wordml/Makefile +++ b/xsl/wordml/Makefile @@ -11,6 +11,7 @@ PAGES = $(STYLESHEETDIR)/docbook-pages.xsl DBKNORM = $(STYLESHEETDIR)/wordml-normalise.xsl PAGESNORM = $(STYLESHEETDIR)/pages-normalise.xsl DBKSECTS = $(STYLESHEETDIR)/wordml-sections.xsl +DBKBLOCKS = $(STYLESHEETDIR)/wordml-blocks.xsl DBKFINAL = $(STYLESHEETDIR)/wordml-final.xsl TEMPLATE = $(STYLESHEETDIR)/template.xml TEMPLATEPAGES = $(STYLESHEETDIR)/template-pages.xml @@ -51,9 +52,12 @@ clean: echo "# foo" > Makefile.param # WordML-to-DocBook -%.docbook.xml: %.sects.xml $(DBKFINAL) Makefile +%.docbook.xml: %.blocks.xml $(DBKFINAL) Makefile $(PROC) -o $@ $(DBKFINAL) $< +%.blocks.xml: %.sects.xml $(DBKBLOCKS) Makefile + $(PROC) -o $@ $(DBKBLOCKS) $< + %.sects.xml: %.norm.xml $(DBKSECTS) Makefile $(PROC) -o $@ $(DBKSECTS) $< @@ -61,9 +65,12 @@ clean: $(PROC) -o $@ $(DBKNORM) $< # Pages-to-DocBook -%.pdocbook.xml: %.psects.xml $(DBKFINAL) Makefile +%.pdocbook.xml: %.pblocks.xml $(DBKFINAL) Makefile $(PROC) -o $@ $(DBKFINAL) $< +%.pblocks.xml: %.psects.xml $(DBKBLOCKS) Makefile + $(PROC) -o $@ $(DBKBLOCKS) $< + %.psects.xml: %.pnorm.xml $(DBKSECTS) Makefile $(PROC) -o $@ $(DBKSECTS) $< diff --git a/xsl/wordml/README b/xsl/wordml/README index 55b3ad5ea..ed8a972c4 100644 --- a/xsl/wordml/README +++ b/xsl/wordml/README @@ -3,8 +3,11 @@ Steve Ball, Bob Stayton docbook.xsl Accepts DocBook XML and produces WordML -wordml-normalise.xsl Accepts WordML and produces (1) -wordml-sections.xsl Accepts (1) and produces (2) -wordml-final.xsl Accepts (2) and produces DocBook XML +docbook-pages.xsl Accepts DocBook XML and produces a Pages index.xml +pages-normalise.xsl Accepts Pages index.xml and produces (1a) +wordml-normalise.xsl Accepts WordML and produces (1w) +wordml-sections.xsl Accepts (1a or 1w) and produces (2) +wordml-blocks.xsl Accepts (2) and produces (3) +wordml-final.xsl Accepts (3) and produces DocBook XML wordml-*.xsl form a chain of XSL stylesheets to convert WordML into DocBook. diff --git a/xsl/wordml/blocks-spec.xml b/xsl/wordml/blocks-spec.xml new file mode 100644 index 000000000..d8ab00572 --- /dev/null +++ b/xsl/wordml/blocks-spec.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/xsl/wordml/docbook-pages.xsl b/xsl/wordml/docbook-pages.xsl index 327f201a3..72b48ae46 100644 --- a/xsl/wordml/docbook-pages.xsl +++ b/xsl/wordml/docbook-pages.xsl @@ -75,7 +75,7 @@ - + @@ -88,8 +88,17 @@ - - + + + + + + @@ -121,7 +130,10 @@ parent::sect2info | parent::sect3info | parent::sect4info | - parent::sect5info'> + parent::sect5info | + parent::appendixinfo | + parent::bibliographyinfo | + parent::chapterinfo'> @@ -145,6 +157,11 @@ parent::sect3 | parent::sect4 | parent::sect5 | + parent::appendix | + parent::bibliography | + parent::bibliodiv | + parent::biblioentry | + parent::chapter | parent::qandaset | parent::qandadiv'> @@ -228,7 +245,7 @@ - + @@ -243,14 +260,21 @@ - - + + + + + address + + + + + - - + @@ -290,7 +314,7 @@ - + @@ -299,41 +323,49 @@ - - - - + + + + otheraddr + + - + - - - - + + + + otheraddr + + - + - - - - + + + + otheraddr + + - + - - - - + + + + otheraddr + + - + @@ -366,11 +398,11 @@ - + - releaseinfo + @@ -381,7 +413,7 @@ - + @@ -1403,11 +1435,19 @@ + + unable to find character style "" + + + + unable to find character style "" + + diff --git a/xsl/wordml/docbook.xsl b/xsl/wordml/docbook.xsl index 07b643aff..f7d2b6160 100755 --- a/xsl/wordml/docbook.xsl +++ b/xsl/wordml/docbook.xsl @@ -305,7 +305,7 @@ - + diff --git a/xsl/wordml/pages-normalise.xsl b/xsl/wordml/pages-normalise.xsl index 06725c204..f87621ae3 100644 --- a/xsl/wordml/pages-normalise.xsl +++ b/xsl/wordml/pages-normalise.xsl @@ -185,6 +185,11 @@ + + + + + diff --git a/xsl/wordml/sections-spec.xml b/xsl/wordml/sections-spec.xml index 49ba53eb3..9019c0b86 100644 --- a/xsl/wordml/sections-spec.xml +++ b/xsl/wordml/sections-spec.xml @@ -34,10 +34,4 @@ - - - - - - diff --git a/xsl/wordml/specifications.xml b/xsl/wordml/specifications.xml index b78e0a12f..8f8c0497f 100755 --- a/xsl/wordml/specifications.xml +++ b/xsl/wordml/specifications.xml @@ -17,6 +17,12 @@ + + 1.4 + 2005-11-11 + SRB + Added bibliography. + 1.3 2005-10-31 @@ -215,6 +221,16 @@ bibliography-title Assigned Word outline level 1. + + bibliography/bibliodiv + bibliodiv-title + + + + biblioentry + biblioentry-title + Metadata elements after the biblioentry-title paragraph become part of the biblioentry. + glossary/glossaryinfo/title glossary-title @@ -639,6 +655,11 @@ variablelist4 author + + bibliomisc + bibliomisc + + surname surname diff --git a/xsl/wordml/template-pages.xml b/xsl/wordml/template-pages.xml index 9fb2dad08..dadc71c9b 100644 --- a/xsl/wordml/template-pages.xml +++ b/xsl/wordml/template-pages.xml @@ -1,2 +1,2 @@ -Lorem ipsum dolor sit ametConsectetur adipiscing elitEset eiusmod tempor incidunt et labore et dolore magna aliquam. Ut enim ad minim veniam, quis nostrud exerc. Irure dolor in reprehend incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse molestaie cillum. Tia non ob ea soluad incommod quae egen ium improb fugiend. Officia deserunt mollit anim id est laborum Et harumd dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda et tam. Neque pecun modut est neque nonor et imper ned libidig met, consectetur adipiscing elit, sed ut labore et dolore magna aliquam is nostrud exercitation ullam mmodo consequet.Duis aute in voluptate velit esseCillum dolore eu fugiat nulla pariatur. At vver eos et accusam dignissum qui blandit est praesent. Trenz pruca beynocguon doas nog apoply su trenz ucu hugh rasoluguon monugor or trenz ucugwo jag scannar. Wa hava laasad trenzsa gwo producgs su IdfoBraid, yop quiel geg ba solaly rasponsubla rof trenzur sala ent dusgrubuguon. Offoctivo immoriatoly, hawrgasi pwicos asi sirucor. Thas sirutciun applios tyu thuso itoms ghuso pwicos gosi sirucor in mixent gosi sirucor ic mixent ples cak ontisi sowios uf Zerm hawr rwivos. Unte af phen neige pheings atoot Prexs eis phat eit sakem eit vory gast te Plok peish ba useing phen roxas. Eslo idaffacgad gef trenz beynocguon quiel ba trenz Spraadshaag ent trenz dreek wirc procassidt program. Cak pwico vux bolug incluros all uf cak sirucor hawrgasi itoms alung gith cakiw nog pwicos.Plloaso mako nuto uf cakso dodtosKoop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu InfuBwain, ghu gill nug bo suloly sispunsiblo fuw cakiw salo anr ristwibutiun. Hei muk neme eis loppe. Treas em wankeing ont sime ploked peish rof phen sumbloat syug si phat phey gavet peish ta paat ein pheeir sumbloats. Aslu unaffoctor gef cak siructiun gill bo cak spiarshoot anet cak GurGanglo gur pwucossing pwutwam. Ghat dodtos, ig pany, gill bo maro tyu ucakw suftgasi pwuructs hod yot tyubo rotowminor. Plloaso mako nuto uf cakso dodtos anr koop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu.Document TemplateInsert content here +Lorem ipsum dolor sit ametConsectetur adipiscing elitEset eiusmod tempor incidunt et labore et dolore magna aliquam. Ut enim ad minim veniam, quis nostrud exerc. Irure dolor in reprehend incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse molestaie cillum. Tia non ob ea soluad incommod quae egen ium improb fugiend. Officia deserunt mollit anim id est laborum Et harumd dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda et tam. Neque pecun modut est neque nonor et imper ned libidig met, consectetur adipiscing elit, sed ut labore et dolore magna aliquam is nostrud exercitation ullam mmodo consequet.Duis aute in voluptate velit esseCillum dolore eu fugiat nulla pariatur. At vver eos et accusam dignissum qui blandit est praesent. Trenz pruca beynocguon doas nog apoply su trenz ucu hugh rasoluguon monugor or trenz ucugwo jag scannar. Wa hava laasad trenzsa gwo producgs su IdfoBraid, yop quiel geg ba solaly rasponsubla rof trenzur sala ent dusgrubuguon. Offoctivo immoriatoly, hawrgasi pwicos asi sirucor. Thas sirutciun applios tyu thuso itoms ghuso pwicos gosi sirucor in mixent gosi sirucor ic mixent ples cak ontisi sowios uf Zerm hawr rwivos. Unte af phen neige pheings atoot Prexs eis phat eit sakem eit vory gast te Plok peish ba useing phen roxas. Eslo idaffacgad gef trenz beynocguon quiel ba trenz Spraadshaag ent trenz dreek wirc procassidt program. Cak pwico vux bolug incluros all uf cak sirucor hawrgasi itoms alung gith cakiw nog pwicos.Plloaso mako nuto uf cakso dodtosKoop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu InfuBwain, ghu gill nug bo suloly sispunsiblo fuw cakiw salo anr ristwibutiun. Hei muk neme eis loppe. Treas em wankeing ont sime ploked peish rof phen sumbloat syug si phat phey gavet peish ta paat ein pheeir sumbloats. Aslu unaffoctor gef cak siructiun gill bo cak spiarshoot anet cak GurGanglo gur pwucossing pwutwam. Ghat dodtos, ig pany, gill bo maro tyu ucakw suftgasi pwuructs hod yot tyubo rotowminor. Plloaso mako nuto uf cakso dodtos anr koop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu.Document TemplateInsert content here diff --git a/xsl/wordml/template.dot b/xsl/wordml/template.dot index 19dab8d6e..90bb83751 100644 Binary files a/xsl/wordml/template.dot and b/xsl/wordml/template.dot differ diff --git a/xsl/wordml/template.xml b/xsl/wordml/template.xml index f99766329..6a9fbea98 100644 --- a/xsl/wordml/template.xml +++ b/xsl/wordml/template.xml @@ -1,3 +1,3 @@ -This document left intentionally blankSteve BallSteve Ball212005-11-03T21:43:00Z2005-11-03T21:43:00Z1535113911.6113This document intentionally left blank. \ No newline at end of file +This document left intentionally blankSteve BallSteve Ball322005-11-03T21:43:00Z2005-11-07T06:32:00Z1535113911.6113This document intentionally left blank. \ No newline at end of file diff --git a/xsl/wordml/wordml-blocks.xsl b/xsl/wordml/wordml-blocks.xsl new file mode 100644 index 000000000..28e8acec8 --- /dev/null +++ b/xsl/wordml/wordml-blocks.xsl @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsl/wordml/wordml-final.xsl b/xsl/wordml/wordml-final.xsl index ab7c13d76..f34233401 100644 --- a/xsl/wordml/wordml-final.xsl +++ b/xsl/wordml/wordml-final.xsl @@ -50,24 +50,62 @@ + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -161,7 +199,43 @@ - + + + + + + + + + + + + + + + + + found with no divisions or entries + found with no divisions or entries + + + + + + + + + @@ -169,14 +243,13 @@ - - - - + @@ -186,6 +259,26 @@ $style = 'article-title'">article appendix + bibliography + bibliodiv + book + chapter + glossary + glossdiv + part + preface + qandaset + qandadiv section @@ -222,26 +315,34 @@ - + ../&abstract;)'> <xsl:apply-templates select="w:r|w:hlink"/> - + + + + + + + + + + @@ -263,6 +364,8 @@ w:pPr/w:pStyle/@w:val = "sect5-subtitle" or w:pPr/w:pStyle/@w:val = "appendix-subtitle" or w:pPr/w:pStyle/@w:val = "bibliography-subtitle" or + w:pPr/w:pStyle/@w:val = "bibliodiv-subtitle" or + w:pPr/w:pStyle/@w:val = "biblioentry-subtitle" or w:pPr/w:pStyle/@w:val = "chapter-subtitle" or w:pPr/w:pStyle/@w:val = "glossary-subtitle" or w:pPr/w:pStyle/@w:val = "part-subtitle" or @@ -300,17 +403,34 @@ + + + + + + + + + + <xsl:apply-templates select='w:r|w:hlink'/> + + + + + + + + + + + + + - + @@ -338,6 +458,21 @@ + + + + + + + + + + + + + + + @@ -439,6 +574,11 @@ + +
+ +
+
- - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + diff --git a/xsl/wordml/wordml-sections.xsl b/xsl/wordml/wordml-sections.xsl index 193e89429..82bb21334 100644 --- a/xsl/wordml/wordml-sections.xsl +++ b/xsl/wordml/wordml-sections.xsl @@ -29,8 +29,6 @@ - - @@ -44,18 +42,6 @@ - - - - - - - - - - - - @@ -124,68 +110,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1032,68 +956,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1173,40 +1035,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1417,32 +1245,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -