From: Steve Ball Date: Fri, 22 Feb 2008 06:07:31 +0000 (+0000) Subject: Added support for Open Office, added edition element, improved list and table support... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51a235cdc45de1c9217f106f10d33d0ab90eaad3;p=docbook-dsssl Added support for Open Office, added edition element, improved list and table support in Word and Pages --- diff --git a/xsl/roundtrip/blocks2dbk.dtd b/xsl/roundtrip/blocks2dbk.dtd index 22b85d4d3..d4b54c02d 100644 --- a/xsl/roundtrip/blocks2dbk.dtd +++ b/xsl/roundtrip/blocks2dbk.dtd @@ -43,6 +43,7 @@ @rnd:style = "pagenums" or @rnd:style = "issuenum" or @rnd:style = "volumenum" or + @rnd:style = "edition" or @rnd:style = "biblioid" or @rnd:style = "bibliosource" or @rnd:style = "bibliomisc" or diff --git a/xsl/roundtrip/blocks2dbk.xsl b/xsl/roundtrip/blocks2dbk.xsl index eedbc40f7..f8e15dff7 100644 --- a/xsl/roundtrip/blocks2dbk.xsl +++ b/xsl/roundtrip/blocks2dbk.xsl @@ -159,7 +159,8 @@ starts-with(@rnd:style, "orderedlist")'> + select='following-sibling::dbk:para[not(@rnd:style) or + (not(starts-with(@rnd:style, "itemizedlist") or starts-with(@rnd:style, "orderedlist")) and @rnd:style != "para-continue")][1]'/> @@ -36,24 +45,29 @@ - - - - - - - - - + + + + + - + @@ -62,14 +76,18 @@ - - - - - - - - + + + + + + + + + + + diff --git a/xsl/roundtrip/dbk2pages.xsl b/xsl/roundtrip/dbk2pages.xsl index ea4f44197..5b6770d00 100644 --- a/xsl/roundtrip/dbk2pages.xsl +++ b/xsl/roundtrip/dbk2pages.xsl @@ -5,11 +5,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sl="http://developer.apple.com/namespaces/sl" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:w='urn:not-yet-implemented' - xmlns:wx='urn:not-yet-implemented' - xmlns:aml='urn:not-yet-implemented' xmlns:doc='http://docbook.org/ns/docbook' - exclude-result-prefixes='doc xi w wx aml'> + xmlns:rnd='http://docbook.org/ns/docbook/roundtrip' + exclude-result-prefixes='doc rnd xi'> @@ -30,6 +28,12 @@ + + + @@ -48,9 +52,9 @@ + sl:app_build_date="Sep 26 2007, 14:46:11"> @@ -63,6 +67,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + DocBookRoundtrip-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70,6 +214,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,22 +289,31 @@ - + + + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -154,30 +334,37 @@ - - + - - - - - - - - - - - + + + + + + + + + + + + SFTTableAttachment- + + + + + + + + + - - @@ -185,15 +372,6 @@ - - - - - - - - - @@ -204,29 +382,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/xsl/roundtrip/dbk2wordml.xsl b/xsl/roundtrip/dbk2wordml.xsl index 1ed1da51c..003d953cf 100644 --- a/xsl/roundtrip/dbk2wordml.xsl +++ b/xsl/roundtrip/dbk2wordml.xsl @@ -220,15 +220,27 @@ - + + + - + - + - + + + + + + + + + diff --git a/xsl/roundtrip/dbk2wp.xsl b/xsl/roundtrip/dbk2wp.xsl index e7fd80b96..3ae434862 100644 --- a/xsl/roundtrip/dbk2wp.xsl +++ b/xsl/roundtrip/dbk2wp.xsl @@ -33,9 +33,11 @@ personname/surname|doc:personname/doc:surname' mode='doc:docprop.author'/> - - + @@ -55,6 +57,7 @@ - - + @@ -158,7 +162,7 @@ doc:address[parent::doc:author|parent::doc:editor|parent::doc:othercredit]' mode='doc:body'> - + @@ -170,6 +174,23 @@ mode='doc:body'> + + + + + + + + + + + + abstract + + + - + - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - + - + @@ -918,7 +951,7 @@ mode='doc:list-continue'/> + mode='doc:body'/> @@ -955,7 +988,8 @@ - + @@ -970,7 +1004,8 @@ - + diff --git a/xsl/roundtrip/specifications.xml b/xsl/roundtrip/specifications.xml index 3811a7ce6..4af252494 100644 --- a/xsl/roundtrip/specifications.xml +++ b/xsl/roundtrip/specifications.xml @@ -17,6 +17,12 @@ + + 1.7 + 2008-02-22 + SRB + Added edition. + 1.6 2007-10-19 @@ -334,6 +340,16 @@ sectN-title Unnumbered sections are mapped to their numbered equivalent. A parameter (named?) may be set to map numbered sections (sect1, etc) back to unnumbered sections. + + + Metadata elements + + + + edition + edition + + Block-level elements diff --git a/xsl/roundtrip/template.xml b/xsl/roundtrip/template.xml index 0010fe80c..5c9614bd1 100644 --- a/xsl/roundtrip/template.xml +++ b/xsl/roundtrip/template.xml @@ -1,3 +1,3 @@ -This document left intentionally blankSteve BallSteve Ball11104602007-08-21T22:03:00Z2007-12-12T08:43:00Z1535Explain113911.0000This document intentionally left blank. \ No newline at end of file +This document left intentionally blankSteve BallSteve Ball12104612007-08-21T22:03:00Z2008-02-22T05:03:00Z1535Explain113911.0000This document intentionally left blank. \ No newline at end of file