From 08c4c2ab1016239d4764a812d6f438604fab3113 Mon Sep 17 00:00:00 2001 From: Steve Ball Date: Tue, 6 Nov 2007 00:10:06 +0000 Subject: [PATCH] Fixes to table and list handling --- xsl/roundtrip/blocks2dbk.dtd | 3 +- xsl/roundtrip/blocks2dbk.xsl | 67 +++ xsl/roundtrip/dbk2wordml.xsl | 7 +- xsl/roundtrip/dbk2wp.xsl | 686 ++++++++++++++++------------- xsl/roundtrip/specifications.xml | 11 + xsl/roundtrip/template.dot | Bin 34816 -> 36864 bytes xsl/roundtrip/template.xml | 2 +- xsl/roundtrip/wordml2normalise.xsl | 13 +- 8 files changed, 482 insertions(+), 307 deletions(-) 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 d7a725dcf0e22c104acd440216afe3ccc1204ffe..69bf25c8966fcf96500ef56070f611f72994e1c1 100644 GIT binary patch delta 4733 zcmeHLX>3$g6h8NL*3PuEbpeL9Xq!@yrJb^tQl>2+47H_LS_oL%f>I(~1PdibX52|6 zTDh7?LP%pmFo7SylZa6i6HQ!xXp9NfXv8f6P0WBA5)2)`^WMC6D4j{&{&Aac&b?=U z_uO~yeT@t#kwImkG_RK8%}uldT>%WoVln2{$cyV&oNDV92NjbjlxF1)Q`gb1qjIJ) z#qRo)h*2Vixj^nv0%41vZHSmA_6^=xn#GKGn-aIJN&hH2 z2Q$#JiYS6o7;Y_o`JTBd+^|MhGom)fE7<1#{J`FV4|%z1&8YlCdb)IBHPI|X2>L?Y zPdBnG#h5G4EiFV;2QQtC`nWGX4LsfeF*U4_?^)|>47si~nkMHL1k-p-gBsIlj8R2l zF1~Ygs5>&oM)hjzSk25?q@(QqFz5aJIQ|Vo<2j6RGOC9gUHQfvz?2uFF@K4Cu2D6ycnYZV>I-HTNsJ6_j!ecU#5F$Wj1D&Fx7dooL zdrgG<$%~!kFuBNNJV?C93*dhT?+r!}Bfc>nk4{8qJiBDPa54e&xuudP$|j<#IgI;^ z>sO2fNE9YIPTH4O9`mJ4KdEIrh5tZaKa&1GafS^dcqOJ#NIN;6?s`H!l#?y8SJH5g zpsTb}W7qHd7Wrn#WwR#F4WQ@2QcW)=$4YdbT4ZVkz}0OOajQ+aX5-dvys)uZTY(W9 z@2xhu^E4ZeZsUW^ki8X9U!K%s6{IeicFd6hmC+`DnY~shYUP}M;UlV~;RZo>S}TnQ zkPnyoU1d+Q{8D@uBmRE^aYfx^bkEjdub2#Kz%DXF4`j-i+#Q< zY6vOR2yiO_Y;sB2y@f8K=w^*)i85Egm4Rm^p(yfHW!5GtBuCTxFLT%!im z8|Mp7DwFpHSZcj3}apRi+!;nzl{G&}ms(u5Yx6J-NU3_26wy4~9I(UzP~ZF%y$ zvRu2TeV+U0p+zCLd^q5fUzat>y1*inbNB8Q@?zN}dvV*P&{wZsJmg`qsiyDjT4u|^ zz-A@plEZe_iJfG=wauiG_Mf z=-E!z*uRRCJ{D!I+<~|ah+#HaRt0BHPt@(v9&$Y0Y$=xdir8ELT03IrdD9gtfrc&f|}yY#92KS zm8a_R)xlMzit4WVS*Qo*I~3VJKTGDvLWifO!E*`$m9-&NLk zb7i%6i#Ht<^-V=By8Dbn?Vn$us9&zLD3dkmIAxv8FYG^CUbkP`6s!KqG&c1Bqka_~nK5^)I$Lg%6(sGcsc_ zj>Ms>$CS1VDYyFV;Sm#SQUuAe@E}>3(1b@9$L38o9i?)FC0CiD2 z`g3sX_hQsd{ow4N2eoSe%O0U!9h!J2ZG#!JcH*wk2ld%-(F0Derna3rXgf@|!(=Zs z1Nbm2r3DDBAM&r1vZLuPxsPtv>4MJ-r_>IVLONXt3rfD2`xn=k0VB3bm zOp8TPlr+WkEZ<9P@|6w4Ifo}v^fL_gBQG-Rtzw2eu`%Enyj*qH9cdIr1cb^`KeHAJ zIc?KRVun1kX@;36szd&;No~PLB3S^vN={6j6aNWtV!E9uL6zGKY5}Z(4X^|0fCJ#a z3?LJ50dBwpc*%*6-|Ew?hlF=%^`rcq8$<}w`|9!gpUxCnvaH*`B?2x--w$|z0U#H6 z1#kd^08i3u0B3j-;II9&0ACKz1ANu`4d8kC5my<$^YFr1(cinHeS5b&-kqnormG)! z2V4jDy}oe{M00^sfNzWZ-=1<%zK+fZxPS`*elr#WEMEdz2`mMwfMq}ss0LVm16VF^ p?ECFtWQRR+>Pzj@ex>Y-JgJ;-l-DEIML_=Xcvw`ZeNQ}R{tF;ZYWDyD delta 2683 zcmbVOU2IfE6h1S1_io$m&vx707G!~TNdrR5?gFJPP)ezVmLK`i_(Gw7(1lb=YbgYb zt$?;dLn?y`Nn;F>@E`>A;)C%gDIxL27>M!37o#!82ZIP95E8q7=k5-@Rw~3vzI$fo zp7WhE=bW9p10TqN5jhf>y^>PHN3;r40gNXS3Er&+tlZ%%;*>PRVda)Z#;y8W_3BwU zJ$-lq5o4|r?pdl+#`GGM_h6qdsN3=Rag7bo=n0rPlvuHPLm1d@@A+ zHWeoSORfWvgyjZE9#13ZKyTzZqBsm6tnm`PkBx2+1k`4km!WfTGK6KY|4EUtp>t?+ zEw#PY(d##17sTed)X67H*2^GT^r$AjQ^h-$XeiVEWthw?$8ld+B zI*odbDhhW=@x(Goq}RH7-K$wm z+PN#4vgSH?Z9SFL!RmH*O71?LH0M6sq}J=6q~Iu4($z%qCa8OLcQv!BQXPoj*wVK+7C~?pTs0XrpcG7aJY6d6R566o;~MownA|!Y)ssoW{GZ z(@(M-?r>jnb|_PM3#X+cO;kqSdTHIAb-~*dN%}A&4j&m5$C*0t>`cjCc;$Pj1y7s^ z)I}zm7$Zqt@K}pdcDRHcw!)zs*<;J7i6lR=3{GLWxvT&er-}S}>rJXclw+dSta3z| z^LR^Cq6?Ma8c1r#vxZOT+G5r?Z2eQ%w&8^Pbw&B&mNroxC|0>z%{m7~{uC6u>1Eo7 z5PCqibBA@m2QVe0z}-&bPME4xYE zk2b2N*bM8PSU_5PUz{ne>FXM$_1@NdF6&U`9BF;IqRFt1FPkN;jE1&MYxpHo7UI7E zRX6-r!7=DzlXh)ekk0|=O_sLn%iAuh6HT>i5fA$KSsW;iQ2b}iU0-dIaBZ+52-o%y1t?|H@Bu8qS=@aq^ZxF z`z98ZE#YjpDW!BtV^BhY)Si~{;BX<`zJX=j{^o4Y`?#K=UTclv(@j+5qTBGGR#oO( zH#}jX?zEj2>1wcjp4%#OAQ?&~uD4d7M1@^|LDfDtwfRiUJwO_j`P7-6 zGpuW#nc|aOXNCXzv0nrDua~}h8fnlHkI1O-wqX7Fo z599$C0sin`1^C|i0^pwd1K?BtVi3)Qgy5kr_l4w|p!IEEEJrm<IeW!*x(<4J4+8_2>wSVZS Y{CTZ -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 @@ - + -- 2.40.0