From: Steve Ball Date: Tue, 6 Nov 2007 00:10:06 +0000 (+0000) Subject: Fixes to table and list handling X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08c4c2ab1016239d4764a812d6f438604fab3113;p=docbook-dsssl Fixes to table and list handling --- diff --git a/xsl/roundtrip/blocks2dbk.dtd b/xsl/roundtrip/blocks2dbk.dtd index 5c4acef62..22b85d4d3 100644 --- a/xsl/roundtrip/blocks2dbk.dtd +++ b/xsl/roundtrip/blocks2dbk.dtd @@ -46,7 +46,8 @@ @rnd:style = "biblioid" or @rnd:style = "bibliosource" or @rnd:style = "bibliomisc" or - @rnd:style = "releaseinfo" + @rnd:style = "releaseinfo" or + @rnd:style = "keyword" &metadata-extra;'> diff --git a/xsl/roundtrip/blocks2dbk.xsl b/xsl/roundtrip/blocks2dbk.xsl index 7d671f2c0..ac2745389 100644 --- a/xsl/roundtrip/blocks2dbk.xsl +++ b/xsl/roundtrip/blocks2dbk.xsl @@ -650,6 +650,8 @@ + bad-metadata @@ -677,6 +679,28 @@ mode='rnd:metadata'/> + + + + + + + + + + + + + + + + + + @@ -742,6 +766,12 @@ select='substring-before(@rnd:style, "-title")'/> + + + + + @@ -811,6 +841,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsl/roundtrip/dbk2wordml.xsl b/xsl/roundtrip/dbk2wordml.xsl index 35a2a27f1..1ed1da51c 100644 --- a/xsl/roundtrip/dbk2wordml.xsl +++ b/xsl/roundtrip/dbk2wordml.xsl @@ -28,6 +28,10 @@ + + + @@ -248,7 +252,8 @@ - + diff --git a/xsl/roundtrip/dbk2wp.xsl b/xsl/roundtrip/dbk2wp.xsl index 6e36b2f84..22e59b7d2 100644 --- a/xsl/roundtrip/dbk2wp.xsl +++ b/xsl/roundtrip/dbk2wp.xsl @@ -384,7 +384,9 @@ - + + @@ -462,10 +464,19 @@ - - + + + + + + + + - + @@ -550,11 +572,39 @@ mode='doc:column'/> + + + + + + + + + Caption + + + + + + + + + + + + + + + + + - + @@ -575,7 +625,7 @@ - + @@ -598,26 +648,43 @@ + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + - + @@ -630,10 +697,12 @@ - + + + - + @@ -835,7 +904,7 @@ + mode='doc:body'/> @@ -843,14 +912,15 @@ - We may not be able to represent this properly. --> + mode='doc:list-continue'/> - - + + @@ -921,291 +991,305 @@ mode='doc:body'/> + + - + + + [ + + ] + encountered - + in - + , but no template matches. - - - - - - - - - encountered - - in - - - , but no template matches. - - - - - - - - - - - - encountered - - in - - - , but no template matches. - - - - + + + + + + + + + + + [ + + ] + + encountered + + in + + + , but no template matches. + + + + + + + + + + + + encountered + + in + + + , but no template matches. + + + + + diff --git a/xsl/roundtrip/specifications.xml b/xsl/roundtrip/specifications.xml index 63fd92187..3811a7ce6 100644 --- a/xsl/roundtrip/specifications.xml +++ b/xsl/roundtrip/specifications.xml @@ -17,6 +17,12 @@ + + 1.6 + 2007-10-19 + SRB + Added keyword. + 1.5 2007-01-05 @@ -682,6 +688,11 @@ variablelist4 orgname + + keyword + keywordset/kyword + Paragraph style. Consecutive keyword elements are merged into a single keywordset parent element. Words (phrases) within a paragraph separated by commas become individual keyword elements. + diff --git a/xsl/roundtrip/template.dot b/xsl/roundtrip/template.dot index d7a725dcf..69bf25c89 100644 Binary files a/xsl/roundtrip/template.dot and b/xsl/roundtrip/template.dot differ diff --git a/xsl/roundtrip/template.xml b/xsl/roundtrip/template.xml index 1c5db525b..cb213a6c2 100644 --- a/xsl/roundtrip/template.xml +++ b/xsl/roundtrip/template.xml @@ -1,3 +1,3 @@ -This document left intentionally blankSteve BallSteve Ball252007-08-21T22:03:00Z2007-08-21T22:03:00Z1535Explain113912This document intentionally left blank. \ No newline at end of file +This document left intentionally blankSteve BallSteve Ball6192007-08-21T22:03:00Z2007-11-05T08:06:00Z1535Explain113911.0000This document intentionally left blank. \ No newline at end of file diff --git a/xsl/roundtrip/wordml2normalise.xsl b/xsl/roundtrip/wordml2normalise.xsl index 7b59e15f8..0cb292b21 100644 --- a/xsl/roundtrip/wordml2normalise.xsl +++ b/xsl/roundtrip/wordml2normalise.xsl @@ -143,10 +143,13 @@ + - + - + @@ -318,7 +321,11 @@ - +